← Back to branch summary

~allenap/maas-test/onwards-python

« back to all changes in this revision

Viewing changes to maastest/tests/test_kvmfixture.py

  • Committer: Gavin Panella
  • Date: 2013-11-13 11:30:14 UTC
  • Revision ID: gavin@gromper.net-20131113113014-s067x0nprjp2305x
Remove some merge artifacts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
maastest/tests/test_kvmfixture.py
112
112
            (fixture.series, fixture.architecture, len(fixture.name)))
113
113
 
114
114
    def test_ip_address(self):
115
 
        self.patch_run_command()
116
115
        series = "test-series"
117
116
        architecture = "test-arch"
118
117
        ip_address = '192.168.2.1'
121
120
            self.assertEqual(ip_address, fixture.ip_address())
122
121
 
123
122
    def test_identity(self):
124
 
        self.patch_run_command()
125
123
        series = "test-series"
126
124
        architecture = "test-arch"
127
125
        ip_address = '192.168.2.1'
450
448
            ssh_command)
451
449
 
452
450
    def test_run_command_adds_details(self):
453
 
        self.patch_run_command()
454
451
        series = "test-series"
455
452
        architecture = "test-arch"
456
453
        return_value = randint(0, 3)