diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-23 22:40:50 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-23 22:40:50 -0800 |
| commit | 79d9e06d79264d614a465971dd43176bcf190703 (patch) | |
| tree | 2368fa4466424355fac1711c9a8b1d3feb7cb52c /smoketests | |
| parent | d27aa094a168dcfb486bbd49ef61be78bd5a50f2 (diff) | |
| download | nova-79d9e06d79264d614a465971dd43176bcf190703.tar.gz nova-79d9e06d79264d614a465971dd43176bcf190703.tar.xz nova-79d9e06d79264d614a465971dd43176bcf190703.zip | |
more smoketest fixes
Diffstat (limited to 'smoketests')
| -rw-r--r-- | smoketests/netadmin_smoketests.py | 5 | ||||
| -rw-r--r-- | smoketests/sysadmin_smoketests.py | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/smoketests/netadmin_smoketests.py b/smoketests/netadmin_smoketests.py index 38beb8fdc..16113e4a9 100644 --- a/smoketests/netadmin_smoketests.py +++ b/smoketests/netadmin_smoketests.py @@ -137,11 +137,6 @@ class SecurityGroupTests(base.UserSmokeTestCase): if not self.wait_for_running(self.data['instance']): self.fail('instance failed to start') self.data['instance'].update() - if not self.wait_for_ping(self.data['instance'].private_dns_name): - self.fail('could not ping instance') - if not self.wait_for_ssh(self.data['instance'].private_dns_name, - TEST_KEY): - self.fail('could not ssh to instance') def test_003_can_authorize_security_group_ingress(self): self.assertTrue(self.conn.authorize_security_group(TEST_GROUP, diff --git a/smoketests/sysadmin_smoketests.py b/smoketests/sysadmin_smoketests.py index e3b84d3d3..3b267bc65 100644 --- a/smoketests/sysadmin_smoketests.py +++ b/smoketests/sysadmin_smoketests.py @@ -191,7 +191,7 @@ class VolumeTests(base.UserSmokeTestCase): self.assertEqual(volume.size, 1) self.data['volume'] = volume # Give network time to find volume. - time.sleep(10) + time.sleep(5) def test_002_can_attach_volume(self): volume = self.data['volume'] @@ -204,6 +204,8 @@ class VolumeTests(base.UserSmokeTestCase): else: self.fail('cannot attach volume with state %s' % volume.status) + # Give volume some time to be ready. + time.sleep(5) volume.attach(self.data['instance'].id, self.device) # wait @@ -218,7 +220,7 @@ class VolumeTests(base.UserSmokeTestCase): self.assertTrue(volume.status.startswith('in-use')) # Give instance time to recognize volume. - time.sleep(10) + time.sleep(5) def test_003_can_mount_volume(self): ip = self.data['instance'].private_dns_name |