remove more references to rebirth and rebirth assets

Author: sawdog

Makefile

@@ -17,14 +17,14 @@
 PACKAGE_NAME = rethinkdb
 
 PROTO_FILE_NAME = ql2.proto
-PROTO_FILE_URL = https://raw.githubusercontent.com/RebirthDB/rebirthdb/next/src/rdb_protocol/${PROTO_FILE_NAME}
+PROTO_FILE_URL = https://raw.githubusercontent.com/rethinkdb/rethinkdb/next/src/rdb_protocol/${PROTO_FILE_NAME}
 TARGET_PROTO_FILE = ${PACKAGE_NAME}/${PROTO_FILE_NAME}
 
 FILE_CONVERTER_NAME = convert_protofile.py
-FILE_CONVERTER_URL = https://raw.githubusercontent.com/RebirthDB/rebirthdb/next/scripts/${FILE_CONVERTER_NAME}
+FILE_CONVERTER_URL = https://raw.githubusercontent.com/rethinkdb/rethinkdb/next/scripts/${FILE_CONVERTER_NAME}
 
 REMOTE_TEST_SETUP_NAME = prepare_remote_test.py
-REMOTE_TEST_SETUP_URL = https://raw.githubusercontent.com/RebirthDB/rebirthdb/next/scripts/${REMOTE_TEST_SETUP_NAME}
+REMOTE_TEST_SETUP_URL = https://raw.githubusercontent.com/rethinkdb/rethinkdb/next/scripts/${REMOTE_TEST_SETUP_NAME}
 
 CONVERTED_PROTO_FILE_NAME = ql2_pb2.py
 TARGET_CONVERTED_PROTO_FILE = ${PACKAGE_NAME}/${CONVERTED_PROTO_FILE_NAME}
@@ -48,14 +48,14 @@ test-unit:
 	pytest -v -m unit
 
 test-integration:
-	@rebirthdb&
+	@rethinkdb&
 	pytest -v -m integration
-	@killall rebirthdb
+	@killall rethinkdb
 
 test-ci:
-	@rebirthdb&
+	@rethinkdb&
 	pytest -v --cov rethinkdb --cov-report xml
-	@killall rebirthdb
+	@killall rethinkdb
 
 test-remote:
 	python ${REMOTE_TEST_SETUP_NAME} pytest -m integration

scripts/install-db.sh

@@ -5,8 +5,10 @@ set -u
 
 export DISTRIB_CODENAME=$(lsb_release -sc)
 
-echo "deb https://dl.bintray.com/rebirthdb/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rebirthdb.list
-wget -qO- https://dl.bintray.com/rebirthdb/keys/pubkey.gpg | sudo apt-key add -
+echo "This currently will not work for rethinkdb. It is in the process of being fixed."
+exit 1
+echo "deb https://dl.bintray.com/rethinkdb/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+wget -qO- https://dl.bintray.com/rethinkdb/keys/pubkey.gpg | sudo apt-key add -
 
 sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="300"
-sudo apt-get --allow-unauthenticated install rebirthdb --option Acquire::Retries=100 --option Acquire::http::Timeout="300"
+sudo apt-get --allow-unauthenticated install rethinkdb --option Acquire::Retries=100 --option Acquire::http::Timeout="300"

tests/helpers.py

@@ -11,11 +11,11 @@ class IntegrationTestCaseBase(object):
 
     def connect(self):
         self.conn = self.r.connect(
-            host=self.rebirthdb_host
+            host=self.rethinkdb_host
         )
 
     def setup_method(self):
-        self.rebirthdb_host=os.getenv('REBIRTHDB_HOST')
+        self.rethinkdb_host=os.getenv('RETHINKDB_HOST')
 
         self.connect()
 

tests/integration/test_ping.py

@@ -10,19 +10,19 @@
 @pytest.mark.integration
 class TestPing(IntegrationTestCaseBase):
     def teardown_method(self):
-        with self.r.connect(host=self.rebirthdb_host) as conn:
+        with self.r.connect(host=self.rethinkdb_host) as conn:
             self.r.db("rethinkdb").table("users").filter(
                 self.r.row["id"].ne("admin")
             ).delete().run(conn)
         super(TestPing, self).teardown_method()
 
     def test_bad_password(self):
         with pytest.raises(self.r.ReqlAuthError):
-            self.r.connect(password=BAD_PASSWORD, host=self.rebirthdb_host)
+            self.r.connect(password=BAD_PASSWORD, host=self.rethinkdb_host)
 
     def test_password_connect(self):
         new_user = "user"
-        with self.r.connect(user="admin", password="", host=self.rebirthdb_host) as conn:
+        with self.r.connect(user="admin", password="", host=self.rethinkdb_host) as conn:
             curr = self.r.db("rethinkdb").table("users").insert(
                 {"id": new_user, "password": BAD_PASSWORD}
             ).run(conn)
@@ -40,7 +40,7 @@ def test_password_connect(self):
                     {
                         'new_val': {'read': True},
                         'old_val': None}]}
-        with self.r.connect(user=new_user, password=BAD_PASSWORD, host=self.rebirthdb_host) as conn:
+        with self.r.connect(user=new_user, password=BAD_PASSWORD, host=self.rethinkdb_host) as conn:
             curr = self.r.db("rethinkdb").table("users").get("admin").run(conn)
             assert curr == {'id': 'admin', 'password': False}
             with pytest.raises(self.r.ReqlPermissionError):
@@ -49,6 +49,6 @@ def test_password_connect(self):
                 ).run(conn)
 
     def test_context_manager(self):
-        with self.r.connect(host=self.rebirthdb_host) as conn:
+        with self.r.connect(host=self.rethinkdb_host) as conn:
             assert conn.is_open() is True
         assert conn.is_open() is False