Comment out a couple of missing tests, add in one that only existed i…

…n Lua, and make the existing ones less noisy while they wait for a result
Hammerspoon · Nov 3, 2022 · 22199ba · 22199ba
1 parent da9cd4d
commit 22199ba
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Hammerspoon Tests/HShttp.m b/Hammerspoon Tests/HShttp.m
@@ -28,14 +28,20 @@ - (void)testHttpDoAsyncRequestWithCachePolicyParam {
     RUN_TWO_PART_LUA_TEST_WITH_TIMEOUT(5)
 }
 
-- (void)testHttpDoAsyncRequestWithRedirectParamButNoCachePolicyParam {
-    RUN_LUA_TEST()
-}
-
-- (void)testHttpDoAsyncRequestWithNoEnableRedirectParam {
+- (void)testHttpDoAsyncRequestWithoutEnableRedirectAndCachePolicyParam {
     RUN_TWO_PART_LUA_TEST_WITH_TIMEOUT(5)
 }
 
+// There's no Lua counterpart for this yet
+//- (void)testHttpDoAsyncRequestWithRedirectParamButNoCachePolicyParam {
+//    RUN_LUA_TEST()
+//}
+
+// There's no Lua counterpart for this yet
+//- (void)testHttpDoAsyncRequestWithNoEnableRedirectParam {
+//    RUN_TWO_PART_LUA_TEST_WITH_TIMEOUT(5)
+//}
+
 - (void)testHttpDoAsyncRequestWithRedirection {
     RUN_TWO_PART_LUA_TEST_WITH_TIMEOUT(5)
 }

diff --git a/extensions/http/test_http.lua b/extensions/http/test_http.lua
@@ -12,7 +12,7 @@ _G["callback"] = function(code, body, headers)
 end
 
 function testHttpDoAsyncRequestWithCachePolicyParamValues()
-  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table") then
+  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table" and _G["respCode"] > 0) then
     -- check return code
     assertIsEqual(200, _G["respCode"])
     assertGreaterThan(0, string.len(_G["respBody"]))
@@ -41,7 +41,7 @@ function testHttpDoAsyncRequestWithCachePolicyParam()
 end
 
 function testHttpDoAsyncRequestWithoutEnableRedirectAndCachePolicyParamValues()
-  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table") then
+  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table" and _G["respCode"] > 0) then
     -- check return code
     assertIsEqual(200, _G["respCode"])
     assertGreaterThan(0, string.len(_G["respBody"]))
@@ -69,7 +69,7 @@ function testHttpDoAsyncRequestWithoutEnableRedirectAndCachePolicyParam()
 end
 
 function testHttpDoAsyncRequestWithRedirectionValues()
-  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table") then
+  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table" and _G["respCode"] > 0) then
     -- check return code
     assertIsEqual(200, _G["respCode"])
     assertGreaterThan(0, string.len(_G["respBody"]))
@@ -98,7 +98,7 @@ function testHttpDoAsyncRequestWithRedirection()
 end
 
 function testHttpDoAsyncRequestWithoutRedirectionValues()
-  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table") then
+  if (type(_G["respCode"]) == "number" and type(_G["respBody"]) == "string" and type(_G["respHeaders"]) == "table" and _G["respCode"] > 0) then
     -- check return code
     assertIsEqual(301, _G["respCode"])
     return success()