tests: simpler if..else logic (think straight!)

bef72c49 · Marco Mariani · Cédric de Saint Martin · 0b662b60 · bef72c49
Commit bef72c49 authored Jun 20, 2013 by Marco Mariani Committed by Cédric de Saint Martin Jun 20, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

slapos/tests/slap.py slapos/tests/slap.py +2 -4

No files found.
--- a/slapos/tests/slap.py
+++ b/slapos/tests/slap.py
@@ -43,12 +43,10 @@ class SlapMixin(unittest.TestCase):
  Usefull methods for slap tests
  """
  def setUp(self):
-    self._server_url = os.environ.get('TEST_SLAP_SERVER_URL', None)
+    self.server_url = os.environ.get('TEST_SLAP_SERVER_URL')
-    if self._server_url is None:
+    if not self.server_url:
      self._patchHttplib()
      self.server_url = 'http://localhost/'
-    else:
-      self.server_url = self._server_url
    print 'Testing against SLAP server %r' % self.server_url
    self.slap = slapos.slap.slap()
    self.partition_id = 'PARTITION_01'