Merge pull request #212 from macbre/test-mysql-on-custom-port

CI | run database on a custom port

Author: macbre

.github/workflows/python.yml

@@ -32,7 +32,7 @@ jobs:
                 MYSQL_ALLOW_EMPTY_PASSWORD: yes
                 MYSQL_DATABASE: index_digest
             ports:
-                - "3306:3306"
+              - "53306:3306"
             options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
@@ -57,18 +57,20 @@ jobs:
           ${{ runner.os }}-pip-
 
     - name: Install dependencies
-      run: make install
+      run: |
+        pip install wheel
+        make install
 
     - name: Linter
       run: make lint
 
     - name: Set up the database
       run: |
         docker ps
-        mysql --protocol=tcp -u root -v < setup.sql
+        mysql --protocol=tcp --port=53306 -u root --password="" -v < setup.sql
         # import the test schema files
         "./sql/populate.sh"
-        mysql --protocol=tcp -uindex_digest -pqwerty index_digest -v -e '\s; SHOW TABLES; SHOW DATABASES;'
+        mysql --protocol=tcp --port=53306 -uindex_digest -pqwerty index_digest -v -e '\s; SHOW TABLES; SHOW DATABASES;'
 
     - name: Tests
       run: make test

.github/workflows/tests.yml

@@ -37,7 +37,7 @@ jobs:
                 MYSQL_ALLOW_EMPTY_PASSWORD: yes
                 MYSQL_DATABASE: index_digest
             ports:
-                - "3306:3306"
+                - "53306:3306"
             options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
@@ -62,18 +62,20 @@ jobs:
           ${{ runner.os }}-pip-
 
     - name: Install dependencies
-      run: make install
+      run: |
+        pip install wheel
+        make install
 
     - name: Linter
       run: make lint
 
     - name: Set up the database
       run: |
         docker ps
-        mysql --protocol=tcp -u root -v < setup.sql
+        mysql --protocol=tcp --port=53306 -u root --password="" -v < setup.sql
         # import the test schema files
         "./sql/populate.sh"
-        mysql --protocol=tcp -uindex_digest -pqwerty index_digest -v -e '\s; SHOW TABLES; SHOW DATABASES;'
+        mysql --protocol=tcp --port=53306 -uindex_digest -pqwerty index_digest -v -e '\s; SHOW TABLES; SHOW DATABASES;'
 
     - name: Tests
       run: make test

README.md

@@ -47,15 +47,15 @@ make install
 We assume database is running locally on port 3306. You can use the following to test your changes locally before pushing them (this one uses MySQL 8.0.20):
 
 ```
-docker run -p 3306:3306 --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -e "MYSQL_DATABASE=index_digest" mysql:8.0.20
+docker run --rm -p 53306:3306 --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -e "MYSQL_DATABASE=index_digest" --name=index_digest_mysql mysql:8.0.22 "--default-authentication-plugin=mysql_native_password"
 ```
 
 Wait until the server is up and running.
 
 ```
-mysql --protocol=tcp -u root -v < setup.sql
+mysql --protocol=tcp --port=53306 -u root --password="" -v < setup.sql
 ./sql/populate.sh
-mysql --protocol=tcp -uindex_digest -pqwerty index_digest -v -e '\s; SHOW TABLES; SHOW DATABASES;'
+mysql --protocol=tcp --port=53306 -uindex_digest -pqwerty index_digest -v -e '\s; SHOW TABLES; SHOW DATABASES;'
 
 make test
 ```

indexdigest/test/__init__.py

@@ -18,7 +18,7 @@ def read_queries_from_log(log_file):
 
 
 class DatabaseTestMixin(object):
-    DSN = 'mysql://index_digest:qwerty@127.0.0.1/index_digest'
+    DSN = 'mysql://index_digest:qwerty@127.0.0.1:53306/index_digest'
     DBNAME = 'index_digest'
 
     @property

sql/populate.sh

@@ -5,6 +5,6 @@ FILES=`ls sql/*.sql`
 for FILE in $FILES
 do
 	echo -n "* Importing ${FILE} ... "
-	cat $FILE | mysql --protocol=tcp -uindex_digest -pqwerty index_digest 2>&1 | grep -v "Using a password"
+	cat $FILE | mysql --protocol=tcp --port=53306 -uindex_digest -pqwerty index_digest 2>&1 | grep -v "Using a password"
 	echo "done"
 done