main now has --whoisOnly and --rdapOnly for testing it

Author: mboot-github

Makefile.tests

@@ -12,7 +12,8 @@ TEST_OPTIONS_ALL = \
 # --------------------------------------------------
 # Tests
 # --------------------------------------------------
-test: prep test1 test2 test3 test4
+# test: prep test1 test2 test3 test4
+test: prep test2
 
 prep:
 	mkdir -p tmp
@@ -26,7 +27,7 @@ test1:
 test2:
 	$(COMMON_VENV) \
 	$(PIP_INSTALL) -r requirements.txt; \
-	./test2.py -f testdata/DOMAINS.txt 2>tmp/$@.2 | tee tmp/$@.1
+	./test2.py --whoisOnly -f testdata/DOMAINS.txt 2>tmp/$@.2 | tee tmp/$@.1;
 
 # test3 simulates the whoisdomain command and has no data type in the output
 test3:

whoisdomain/context/parameterContext.py

@@ -137,13 +137,13 @@
     "default": false,
     "optional": true,
     "help": "if set to true we skip the strip www action"
-  }
+  },
   "rdapOnly": {
     "type": "bool",
     "default": false,
     "optional": true,
     "help": "if set to true we only consult rdap"
-  }
+  },
   "whoisOnly": {
     "type": "bool",
     "default": false,

whoisdomain/main.py

@@ -35,6 +35,9 @@
 WithStripHttpStatus: bool = False
 WithNoIgnoreWww: bool = False
 
+RdapOnly: bool = False
+WhoisOnly: bool = False
+
 
 class ResponseCleaner:
     data: str
@@ -235,7 +238,9 @@ def testItem1(
         WithPublicSuffix, \
         WithExtractServers, \
         WithStripHttpStatus, \
-        WithNoIgnoreWww
+        WithNoIgnoreWww, \
+        RdapOnly, \
+        WhoisOnly
 
     pc = whois.ParameterContext(
         ignore_returncode=IgnoreReturncode,
@@ -248,6 +253,8 @@ def testItem1(
         extractServers=WithExtractServers,
         stripHttpStatus=WithStripHttpStatus,
         noIgnoreWww=WithNoIgnoreWww,
+        whoisOnly=WhoisOnly,
+        rdapOnly=RdapOnly,
     )
 
     # use the new query (can also simply use q2()
@@ -540,7 +547,7 @@ def showFailures() -> None:
 
 
 def main() -> None:  # noqa: C901,PLR0915
-    global PrintJson, Verbose, IgnoreReturncode, PrintGetRawWhoisResult, Ruleset, SIMPLISTIC, WithRedacted, TestAllTld, TestRunOnly, WithPublicSuffix, WithExtractServers, WithStripHttpStatus, WithNoIgnoreWww  # noqa: E501  # pylint: disable=line-too-long
+    global PrintJson, Verbose, IgnoreReturncode, PrintGetRawWhoisResult, Ruleset, SIMPLISTIC, WithRedacted, TestAllTld, TestRunOnly, WithPublicSuffix, WithExtractServers, WithStripHttpStatus, WithNoIgnoreWww, RdapOnly, WhoisOnly  # noqa: E501  # pylint: disable=line-too-long
 
     name: str = pathlib.Path(sys.argv[0]).name
     SIMPLISTIC = True
@@ -573,6 +580,8 @@ def main() -> None:  # noqa: C901,PLR0915
                 "extractServers",
                 "stripHttpStatus",
                 "withNoIgnoreWww",
+                "rdapOnly",
+                "whoisOnly",
             ],
         )
     except getopt.GetoptError:
@@ -697,6 +706,12 @@ def main() -> None:  # noqa: C901,PLR0915
         if opt in ("--withNoIgnoreWww"):
             WithNoIgnoreWww = True
 
+        if opt in ("--rdapOnly"):
+            RdapOnly = True
+
+        if opt in ("--whoisOnly"):
+            WhoisOnly = True
+
     msg = f"{name} SIMPLISTIC: {SIMPLISTIC}"
     log.debug(msg)