← Back to branch summary

~ubuntu-branches/ubuntu/utopic/maas/utopic

« back to all changes in this revision

Viewing changes to src/maasserver/api/tests/test_user.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/api/tests/test_user.py
87
87
            httplib.FORBIDDEN, response.status_code, response.content)
88
88
 
89
89
    def test_GET_lists_users(self):
90
 
        users = [factory.make_user() for counter in range(2)]
 
90
        users = [factory.make_User() for counter in range(2)]
91
91
 
92
92
        response = self.client.get(reverse('users_handler'))
93
93
        self.assertEqual(httplib.OK, response.status_code, response.content)
104
104
        # the two may use different collations.
105
105
        users = [factory.make_name('user').lower() for counter in range(5)]
106
106
        for user in users:
107
 
            factory.make_user(username=user)
 
107
            factory.make_User(username=user)
108
108
 
109
109
        response = self.client.get(reverse('users_handler'))
110
110
        self.assertEqual(httplib.OK, response.status_code, response.content)
126
126
            reverse('user_handler', args=['username']))
127
127
 
128
128
    def test_GET_finds_user(self):
129
 
        user = factory.make_user()
 
129
        user = factory.make_User()
130
130
 
131
131
        response = self.client.get(
132
132
            reverse('user_handler', args=[user.username]))
138
138
        self.assertFalse(returned_user['is_superuser'])
139
139
 
140
140
    def test_GET_shows_expected_fields(self):
141
 
        user = factory.make_user()
 
141
        user = factory.make_User()
142
142
 
143
143
        response = self.client.get(
144
144
            reverse('user_handler', args=[user.username]))