From 6dba3ea86d763c5112e8fa788a5fd141c01dfb59 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 24 Jan 2021 21:25:07 +0000 Subject: [PATCH] Add back time format override --- .github/workflows/django.yml | 1 - PyRIGS/tests/regions.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index b6ffc715..eec2444d 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -25,7 +25,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Setup Chromedriver run: | - export LANGUAGE=en_GB.UTF-8 wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip unzip chromedriver_linux64.zip export PATH=$PATH:$(pwd) diff --git a/PyRIGS/tests/regions.py b/PyRIGS/tests/regions.py index 0e2110bf..bcb7501d 100644 --- a/PyRIGS/tests/regions.py +++ b/PyRIGS/tests/regions.py @@ -1,5 +1,6 @@ from pypom import Region from django.utils import timezone +from django.conf import settings from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions from selenium.webdriver.remote.webelement import WebElement @@ -26,7 +27,7 @@ def get_time_format(): # Default time_format = "%H:%M" # If system is 12hr - if timezone.now().strftime("%p"): + if timezone.now().strftime("%p") or settings.CI: time_format = "%I:%M %p" return time_format