← Back to branch summary

~rvb/maas/ephemeral-simplestreams

« back to all changes in this revision

Viewing changes to maastest/tests/test_maasfixture.py

  • Committer: MaaS Lander
  • Author(s): Julian Edwards
  • Date: 2014-02-19 00:46:30 UTC
  • mfrom: (129.2.4 rename-maas)
  • Revision ID: maas_lander-20140219004630-vnljydvnzemtrtdq
[r=rvb][bug=][author=julian-edwards] Update maas-test to work with the renamed maas-region-admin in trunk for Trusty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
maastest/tests/test_maasfixture.py
280
280
            Exception, maas_fixture.configure_default_maas_url)
281
281
        self.assertIn(error_msg, text_type(error))
282
282
 
 
283
    def test_maas_admin_property_runs_which_command(self):
 
284
        fixture = self.make_kvm_fixture()
 
285
        maas_fixture = self.make_maas_fixture(fixture)
 
286
        _ = maas_fixture.maas_admin
 
287
        
 
288
        create_call = fixture.run_command.call_args_list[0]
 
289
        args, kwargs = create_call
 
290
        command_line = args[0]
 
291
        self.assertEqual(
 
292
            ['which', 'maas-region-admin'],
 
293
            command_line[:2])
 
294
 
283
295
    def test_create_maas_admin_creates_admin(self):
284
296
        fixture = self.make_kvm_fixture()
285
297
 
286
298
        maas_fixture = self.make_maas_fixture(fixture)
 
299
        maas_fixture._maas_admin = 'maas-region-admin'
287
300
        username, password = maas_fixture.create_maas_admin()
288
301
 
289
302
        create_call = fixture.run_command.call_args_list[0]
290
303
        args, kwargs = create_call
291
304
        command_line = args[0]
292
305
        self.assertEqual(
293
 
            ['sudo', 'maas', 'createadmin'],
 
306
            ['sudo', 'maas-region-admin', 'createadmin'],
294
307
            command_line[:3])
295
308
        self.assertIn('--username=%s' % username, command_line)
296
309
        self.assertIn('--password=%s' % password, command_line)
302
315
        fixture.run_command.return_value = (0, actual_api_key, 'stderr output')
303
316
 
304
317
        maas_fixture = self.make_maas_fixture(fixture)
 
318
        maas_fixture._maas_admin = 'maas-region-admin'
305
319
        api_key = maas_fixture.query_api_key(username)
306
320
 
307
321
        args, kwargs = fixture.run_command.call_args_list[0]
308
322
        command_line = args[0]
309
323
        self.assertEqual(
310
 
            ['sudo', 'maas', 'apikey', '--username=%s' % username],
311
 
            command_line)
 
324
            ['sudo', 'maas-region-admin', 'apikey',
 
325
                '--username=%s' % username], command_line)
312
326
        self.assertEqual(actual_api_key, api_key)
313
327
 
314
328
    def test_get_maas_api_client_returns_client(self):
731
745
 
732
746
    def test_dump_data_calls_dumpdata(self):
733
747
        maas_fixture = self.make_maas_fixture()
 
748
        maas_fixture._maas_admin = 'maas-region-admin'
734
749
        self.patch(
735
750
            maas_fixture.kvm_fixture, 'run_command',
736
751
            mock.MagicMock(return_value=(0, '', '')))
737
752
        maas_fixture.dump_data()
738
753
        self.assertIn(
739
754
            mock.call([
740
 
                'sudo', 'maas', 'dumpdata',
 
755
                'sudo', 'maas-region-admin', 'dumpdata',
741
756
                'metadataserver.NodeCommissionResult']),
742
757
            maas_fixture.kvm_fixture.run_command.mock_calls)