apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge markers introduced by conflict from 2660a6

Browse Source 
test had conflict markers as a result of an improper merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-05-14 14:35:00 +05:30
parent 55739f93b8
commit 80c2ea769e
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/smoke/test_guest_vlan_range.py
View File

@ -150,19 +150,6 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
)
self.debug("Releasing guest vlan range");
<<<<<<< HEAD
dedicated_guest_vlan_response.release(self.apiclient)
list_dedicated_guest_vlan_range_response = PhysicalNetwork.listDedicated(
self.apiclient,
id=dedicate_guest_vlan_range_response.id
)
dedicated_guest_vlan_response = list_dedicated_guest_vlan_range_response[0]
self.assertEqual(
dedicated_guest_vlan_response.account,
"system",
"Check account name is system account in listDedicatedGuestVlanRanges"
)
=======
dedicate_guest_vlan_range_response.release(self.apiclient)
list_dedicated_guest_vlan_range_response = PhysicalNetwork.listDedicated(self.apiclient)
self.assertEqual(
@ -171,5 +158,3 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
"Check vlan range is not available in listDedicatedGuestVlanRanges"
)
>>>>>>> master