minor test mods for Windows platform

Author: klehman-rally

test/test_conn.py

@@ -15,8 +15,8 @@
 TRIAL = "trial.rallydev.com"
 PROD  = "us1.rallydev.com"
 
-#TRIAL_USER = "[email protected]"
-#TRIAL_PSWD = "********"
+TRIAL_USER = "[email protected]"
+TRIAL_PSWD = "********"
 
 HTTPS_PROXY = "127.0.0.1:9654"
 
@@ -60,13 +60,14 @@ def test_nonexistent_server():
     bogus_server = "bogus.notreally.bug"
     expectedErrMsg = "ping: cannot resolve %s: Unknown host" % bogus_server
     #print expectedErrMsg
+    winExpectedErrMsg = "Ping request could not find host %s" % bogus_server
     with py.test.raises(RallyRESTAPIError) as excinfo:
         rally = Rally(server=bogus_server)
     actualErrVerbiage = excinfo.value.args[0]  # becuz Python2.6 deprecates message :-(
     #print actualErrVerbiage
     assert excinfo.value.__class__.__name__ == 'RallyRESTAPIError'
     #assert actualErrVerbiage == expectedErrMsg
-    assert expectedErrMsg in actualErrVerbiage
+    assert (expectedErrMsg in actualErrVerbiage or winExpectedErrMsg in actualErrVerbiage)
     time.sleep(1)
 
 
@@ -130,12 +131,13 @@ def test_bad_server_spec():
     """
     bad_server = "ww!w.\fo,o\r\n.c%om"
     expectedErrMsg = "Unknown host"
+    winExpectedErrMsg = "could not find host"
     with py.test.raises(RallyRESTAPIError) as excinfo:
         rally = Rally(server=bad_server, timeout=3)
         response = rally.get('Project', fetch=False, limit=10)
     actualErrVerbiage = excinfo.value.args[0]  # becuz Python2.6 deprecates message :-(
     assert excinfo.value.__class__.__name__ == 'RallyRESTAPIError'
-    assert 'cannot resolve' in actualErrVerbiage and 'Unknown host' in actualErrVerbiage
+    assert (expectedErrMsg in actualErrVerbiage or winExpectedErrMsg in actualErrVerbiage)
     time.sleep(1)
 
     with py.test.raises(RallyRESTAPIError) as excinfo:
@@ -145,7 +147,7 @@ def test_bad_server_spec():
         response = rally.get('Project', fetch=False, limit=5)
     actualErrVerbiage = excinfo.value.args[0]  # becuz Python2.6 deprecates message :-(
     assert excinfo.value.__class__.__name__ == 'RallyRESTAPIError'
-    assert 'cannot resolve' in actualErrVerbiage and 'Unknown host' in actualErrVerbiage
+    assert (expectedErrMsg in actualErrVerbiage or winExpectedErrMsg in actualErrVerbiage)
     time.sleep(1)
 
 def test_insuff_credentials():

test/test_query.py

@@ -28,7 +28,7 @@ def test_basic_query():
     response = rally.get('Project', fetch=False, limit=10)
     assert response.status_code == 200
     assert response.errors   == []
-    assert len(response.warnings) == 1  # damn deprecation warnings
+    assert len(response.warnings) == 1  # WSAPI deprecation warning
     assert response.resultCount > 0
 
 def test_simple_named_fields_query():