Fix the nsxt_uninstall test

Change-Id: I2f54afe099f879e40180b1b8740d60e2f664fd46
This commit is contained in:
ibumarskov 2016-10-14 10:06:29 +03:00
parent 1a39ecce98
commit 9f5108f83a
2 changed files with 10 additions and 17 deletions

View File

@ -90,9 +90,3 @@ class TestNSXtBase(TestBasic):
expected=[1 if failover else 0], expected=[1 if failover else 0],
raise_on_err=not failover raise_on_err=not failover
) )
output = self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command='fuel2 plugins list -f value -c name'
).stdout[-1].split(' ')
assert_true(plugin_name in output != failover, msg)

View File

@ -71,9 +71,8 @@ class TestNSXtSmoke(TestNSXtBase):
Scenario: Scenario:
1. Revert to snapshot nsxt_install 1. Revert to snapshot nsxt_install
2. Remove NSX-T plugin. 2. Remove NSX-T plugin
3. Run command 'fuel plugins' to ensure the NSX-T plugin has 3. Verify that plugin is removed.
been removed.
Duration: 5 min Duration: 5 min
""" """
@ -81,16 +80,16 @@ class TestNSXtSmoke(TestNSXtBase):
self.env.revert_snapshot("nsxt_install") self.env.revert_snapshot("nsxt_install")
self.show_step(2) self.show_step(2)
cmd = 'fuel plugins --remove {0}=={1}'.format( self.delete_nsxt_plugin()
self.default.PLUGIN_NAME, self.default.NSXT_PLUGIN_VERSION)
self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip,
cmd=cmd,
err_msg='Can not remove plugin.')
self.show_step(3) self.show_step(3)
self.delete_nsxt_plugin() plugin_name = self.default.PLUGIN_NAME
output = self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip,
cmd='fuel plugins list')['stdout'].pop().split(' ')
assert_true(plugin_name not in output,
"Plugin '{0}' is not removed".format(plugin_name))
@test(depends_on=[nsxt_install], @test(depends_on=[nsxt_install],
groups=["nsxt_smoke"]) groups=["nsxt_smoke"])