Removing a server dependency on the client code.

gmh5225 · Dec 5, 2017 · faf8f72 · faf8f72
1 parent 6aa33a9
commit faf8f72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/grr/endtoend_tests/limits.py b/grr/endtoend_tests/limits.py
@@ -2,12 +2,11 @@
 """End to end tests for client resource limits."""
 
 
-from grr.client.client_actions import admin
-from grr.client.client_actions import standard
 from grr.endtoend_tests import base
 from grr.lib.rdfvalues import paths as rdf_paths
 from grr.server import aff4
 from grr.server import flow
+from grr.server import server_stubs
 from grr.server.flows.general import transfer
 
 
@@ -26,7 +25,7 @@ def Start(self):
         file_size_override=2 * 1024 * 1024,
         pathtype=rdf_paths.PathSpec.PathType.OS)
     self.CallClient(
-        standard.CopyPathToFile,
+        server_stubs.CopyPathToFile,
         offset=0,
         length=2 * 1024 * 1024,  # 4 default sized blobs
         src_path=urandom,
@@ -55,13 +54,13 @@ class CPULimitTestFlow(flow.GRRFlow):
 
   @flow.StateHandler()
   def Start(self):
-    self.CallClient(admin.BusyHang, integer=5, next_state="State1")
+    self.CallClient(server_stubs.BusyHang, integer=5, next_state="State1")
 
   @flow.StateHandler()
   def State1(self, responses):
     if not responses.success:
       raise flow.FlowError(responses.status)
-    self.CallClient(admin.BusyHang, integer=5, next_state="Done")
+    self.CallClient(server_stubs.BusyHang, integer=5, next_state="Done")
 
   @flow.StateHandler()
   def Done(self, responses):

diff --git a/grr/endtoend_tests/transfer.py b/grr/endtoend_tests/transfer.py
@@ -6,7 +6,6 @@
 import threading
 
 
-from grr.client.client_actions import standard
 from grr.endtoend_tests import base
 from grr.lib.rdfvalues import crypto as rdf_crypto
 from grr.lib.rdfvalues import flows as rdf_flows
@@ -15,6 +14,7 @@
 from grr.proto import tests_pb2
 from grr.server import aff4
 from grr.server import flow
+from grr.server import server_stubs
 from grr.server.aff4_objects import aff4_grr
 from grr.server.flows.general import fingerprint
 from grr.server.flows.general import transfer
@@ -43,7 +43,7 @@ def Start(self):
 
     for _ in range(self.args.file_limit):
       self.CallClient(
-          standard.CopyPathToFile,
+          server_stubs.CopyPathToFile,
           offset=0,
           length=2 * 1024 * 1024,  # 4 default sized blobs
           src_path=urandom,
@@ -61,7 +61,9 @@ def HashFile(self, responses):
           fingerprint.FingerprintFile.__name__,
           next_state=transfer.MultiGetFile.__name__,
           pathspec=response.dest_path,
-          request_data={"pathspec": response.dest_path})
+          request_data={
+              "pathspec": response.dest_path
+          })
 
   @flow.StateHandler()
   def MultiGetFile(self, responses):

diff --git a/grr/tools/console.py b/grr/tools/console.py
@@ -24,7 +24,6 @@
 
 from grr import config
 from grr.config import contexts
-from grr.endtoend_tests import base
 from grr.lib import flags
 from grr.lib import type_info
 from grr.lib import utils
@@ -56,8 +55,6 @@
 from grr.server.flows.general import memory
 # pylint: enable=unused-import
 
-from grr.tools import end_to_end_tests
-
 flags.DEFINE_string("client", None,
                     "Initialise the console with this client id "
                     "(e.g. C.1234345).")
@@ -113,7 +110,6 @@ def main(argv):
       # namespace.
       "StartFlowAndWait": flow_utils.StartFlowAndWait,
       "StartFlowAndWorker": debugging.StartFlowAndWorker,
-      "RunEndToEndTests": end_to_end_tests.RunEndToEndTests,
   }
 
   locals_vars.update(globals())  # add global variables to console