ReQL test runner using existing server is broken

[danielmewes]

test/rql_test/test_runner supports the -c and -d options to connect to an already running server. That is very useful to run tests against a server running under Valgrind for example.

However this mode of operation seems to be broken.

I'm getting this error:

Traceback (most recent call last):
  File "./test-runner", line 761, in <module>
    main()
  File "./test-runner", line 540, in main
    build_directory = options.executable_path
AttributeError: Values instance has no attribute 'executable_path'

The executable_path option doesn't seem to exist anymore though. If I change the code to specify the path manually the next problem is

Traceback (most recent call last):
  File "./test-runner", line 761, in <module>
    main()
  File "./test-runner", line 541, in main
    servers = RethinkDBRunningServer(options.driver_port, options.cluster_port)
  File "./test-runner", line 367, in __init__
    self.rethinkdb_executable_ = rethinkdb_executable
NameError: global name 'rethinkdb_executable' is not defined

That line just seems to be unnecessary, since self.rethinkdb_executable_ isn't used anywhere as far as I can see.

Ping @larkost

[danielmewes]

Another problem:

RethinkDB server failed: RethinkDBRunningServer instance has no attribute 'stop'== Failed polyglot/match.py test with result code 1 (/home/ssd3/daniel/rethinkdb/test/rql_test/src/match.yaml) Output

[Tryneus]

I ran into the same problem and noticed those were unused, so I got this working with the following diff:

--- test/rql_test/test-runner
+++ test/rql_test/test-runner
@@ -357,21 +357,20 @@
                 else:
                     expected = expected['cd']
             return Langs.repr_expected_for(lang, expected)

         return None

 class RethinkDBRunningServer:
     def __init__(self, driver_port, cluster_port):
         self.driver_port_ = driver_port
         self.cluster_port_ = cluster_port
-        self.rethinkdb_executable_ = rethinkdb_executable

     def driver_port(self):
         return self.driver_port_

     def cluster_port(self):
         return self.cluster_port_

     def executable(self):
         return 'NOT_AVALIBLE_FOR_RUNNING_SERVERS'

@@ -530,21 +529,20 @@

     options, args = parser.parse_args()

     # - options validation

     # cluster_port/driver_port

     if (options.cluster_port is not None or options.driver_port is not None) and None in (options.cluster_port, options.driver_port):
         parser.error('If either of the following options are used, both must be specifed: -c/--cluster-port, -d/--driver-port')
     if options.driver_port is not None:
-        build_directory = options.executable_path
         servers = RethinkDBRunningServer(options.driver_port, options.cluster_port)
         # TODO: validate that this is actually a running server

         if options.shards != 1:
             parser.error('The -c/--cluster-port and -d/--driver-port options can not be used with -s/--shards')

     # - add filters

     for newFilter in args:
         try:

Didn't hit that problem with stop, though.

[larkost]

Some of this is already in the Python3 version that I am in the middle of merging right now. Once the validation runs I am doing right now get through (and the merge is completed) I will look at this.

[larkost]

All of the changes for this are already in next from other checkins.