← Back to branch summary

~ubuntu-branches/ubuntu/vivid/maas/vivid

« back to all changes in this revision

Viewing changes to src/maasserver/views/tests/test_prefs.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez, Jeroen Vermeulen, Andres Rodriguez, Jason Hobbs, Raphaël Badin, Louis Bouchard, Gavin Panella
  • Date: 2014-08-21 19:36:30 UTC
  • mfrom: (1.3.1)
  • Revision ID: package-import@ubuntu.com-20140821193630-kertpu5hd8yyss8h
Tags: 1.7.0~beta7+bzr3266-0ubuntu1
https://launchpad.net/bugs/1365130
https://launchpad.net/bugs/1346703
* New Upstream Snapshot, Beta 7 bzr3266

[ Jeroen Vermeulen ]
* debian/extras/99-maas-sudoers
  debian/maas-dhcp.postinst
  debian/rules
  - Add second DHCP server instance for IPv6.
* debian/maas-region-controller-min.install
  debian/maas-region-controller-min.lintian-overrides
  - Install deployment user-data: maas_configure_interfaces.py script.
* debian/maas-cluster-controller.links
  debian/maas-cluster-controller.install
  debian/maas-cluster-controller.postinst
  - Reflect Celery removal changes made in trunk r3067.
  - Don't install celeryconfig_cluster.py any longer. 
  - Don't install maas_local_celeryconfig_cluster.py any longer.
  - Don't symlink maas_local_celeryconfig_cluster.py from /etc to /usr.
  - Don't insert UUID into maas_local_celeryconfig_cluster.py.

[ Andres Rodriguez ]
* debian/maas-region-controller-min.postrm: Cleanup lefover files.
* debian/maas-dhcp.postrm: Clean leftover configs.
* Provide new maas-proxy package that replaces the usage of
  squid-deb-proxy:
  - debian/control: New maas-proxy package that replaces the usage
    of squid-deb-proxy; Drop depends on squid-deb-proxy.
  - Add upstrart job.
  - Ensure squid3 is stopped as maas-proxy uses a caching proxy.
* Remove Celery references to cluster controller:
  - Rename upstart job from maas-pserv to maas-cluster; rename
    maas-cluster-celery to maas-cluster-register. Ensure services
    are stopped on upgrade.
  - debian/maintscript: Cleanup config files.
  - Remove all references to the MAAS celery daemon and config
    files as we don't use it like that anymore
* Move some entries in debian/maintscript to
  debian/maas-cluster-controller.maintscript
* Remove usage of txlongpoll and rabbitmq-server. Handle upgrades
  to ensure these are removed correctly.

[ Jason Hobbs ]
* debian/maas-region-controller-min.install: Install
  maas-generate-winrm-cert script.

[ Raphaël Badin ]
* debian/extras/maas-region-admin: Bypass django-admin as it prints
  spurious messages to stdout (LP: #1365130).

[Louis Bouchard]
* debian/maas-cluster-controller.postinst:
  - Exclude /var/log/maas/rsyslog when changing ownership
    (LP: #1346703)

[Gavin Panella]
* debian/maas-cluster-controller.maas-clusterd.upstart:
  - Don't start-up the cluster controller unless a shared-secret has
    been installed.
* debian/maas-cluster-controller.maas-cluster-register.upstart: Drop.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/views/tests/test_prefs.py
54
54
        self.client_log_in()
55
55
        user = self.logged_in_user
56
56
        # Create a few tokens.
57
 
        for i in range(3):
 
57
        for _ in range(3):
58
58
            user.get_profile().create_authorisation_token()
59
59
        response = self.client.get('/account/prefs/')
60
60
        doc = fromstring(response.content)
170
170
    def test_key_can_be_added_if_same_key_already_setup_for_other_user(self):
171
171
        self.client_log_in()
172
172
        key_string = get_data('data/test_rsa0.pub')
173
 
        key = SSHKey(user=factory.make_user(), key=key_string)
 
173
        key = SSHKey(user=factory.make_User(), key=key_string)
174
174
        key.save()
175
175
        response = self.client.post(
176
176
            reverse('prefs-add-sshkey'), {'key': key_string})
183
183
    def test_delete_key_GET(self):
184
184
        # The 'Delete key' page displays a confirmation page with a form.
185
185
        self.client_log_in()
186
 
        key = factory.make_sshkey(self.logged_in_user)
 
186
        key = factory.make_SSHKey(self.logged_in_user)
187
187
        del_link = reverse('prefs-delete-sshkey', args=[key.id])
188
188
        response = self.client.get(del_link)
189
189
        doc = fromstring(response.content)
199
199
 
200
200
    def test_delete_key_GET_cannot_access_someone_elses_key(self):
201
201
        self.client_log_in()
202
 
        key = factory.make_sshkey(factory.make_user())
 
202
        key = factory.make_SSHKey(factory.make_User())
203
203
        del_link = reverse('prefs-delete-sshkey', args=[key.id])
204
204
        response = self.client.get(del_link)
205
205
 
209
209
        # Deleting a nonexistent key requires no confirmation.  It just
210
210
        # "succeeds" instantaneously.
211
211
        self.client_log_in()
212
 
        key = factory.make_sshkey(self.logged_in_user)
 
212
        key = factory.make_SSHKey(self.logged_in_user)
213
213
        del_link = reverse('prefs-delete-sshkey', args=[key.id])
214
214
        key.delete()
215
215
        response = self.client.get(del_link)
218
218
    def test_delete_key_POST(self):
219
219
        # A POST request deletes the key, and redirects to the prefs.
220
220
        self.client_log_in()
221
 
        key = factory.make_sshkey(self.logged_in_user)
 
221
        key = factory.make_SSHKey(self.logged_in_user)
222
222
        del_link = reverse('prefs-delete-sshkey', args=[key.id])
223
223
        response = self.client.post(del_link, {'post': 'yes'})
224
224
 
229
229
        # Deleting a key that's already been deleted?  Basically that's
230
230
        # success.
231
231
        self.client_log_in()
232
 
        key = factory.make_sshkey(self.logged_in_user)
 
232
        key = factory.make_SSHKey(self.logged_in_user)
233
233
        del_link = reverse('prefs-delete-sshkey', args=[key.id])
234
234
        key.delete()
235
235
        response = self.client.post(del_link, {'post': 'yes'})