cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [43/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion to 2054164
Date Tue, 14 May 2013 23:15:38 GMT
Fixing merge markers introduced by conflict from 2660a6

test had conflict markers as a result of an improper merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80c2ea76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80c2ea76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80c2ea76

Branch: refs/heads/vmware-storage-motion
Commit: 80c2ea769e63e1f252805c922bc9765782db392b
Parents: 55739f9
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue May 14 14:35:00 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue May 14 14:35:45 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_guest_vlan_range.py |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80c2ea76/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index 704fe59..a99ad99 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -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
-        


Mime
View raw message