Merge branch 'master' into farhanumar/psre-2485-1

Author: farhanumar

Makefile

@@ -56,7 +56,7 @@
         dev.static dev.static.lms dev.static.studio dev.stats dev.status \
         dev.stop dev.up dev.up.attach dev.up.shell \
         dev.up.without-deps dev.up.without-deps.shell dev.up.with-programs \
-        dev.up.with-watchers dev.validate docs e2e-tests e2e-tests.with-shell \
+        dev.up.with-watchers dev.validate docs \
         help requirements impl-dev.clone.https impl-dev.clone.ssh impl-dev.provision \
         impl-dev.pull impl-dev.pull.without-deps impl-dev.up impl-dev.up.attach \
         impl-dev.up.without-deps selfcheck upgrade \
@@ -212,12 +212,8 @@ impl-dev.pull.%: ## Pull latest Docker images for services and their dependencie
 ########################################################################################
 
 impl-dev.provision: ## Provision dev environment with default services, and then stop them.
-	# We provision all default services as well as 'e2e' (end-to-end tests).
-	# e2e is not part of `DEFAULT_SERVICES` because it isn't a service;
-	# it's just a way to tell ./provision.sh that the fake data for end-to-end
-	# tests should be prepared.
 	make dev.check-memory
-	$(WINPTY) bash ./provision.sh $(DEFAULT_SERVICES)+e2e
+	$(WINPTY) bash ./provision.sh $(DEFAULT_SERVICES)
 	make dev.stop
 
 dev.provision: ## Provision dev environment with default services, and then stop them.
@@ -604,12 +600,6 @@ metrics-opt-out: ## To opt out of metrics data collection
 docs: ## generate Sphinx HTML documentation, including API docs
 	tox -e docs
 
-e2e-tests: dev.up.lms+studio+firefox+chrome ## Run the end-to-end tests against the service containers.
-	docker run -t --network=$(COMPOSE_PROJECT_NAME)_default -v $(DEVSTACK_WORKSPACE)/edx-e2e-tests:/edx-e2e-tests --env-file $(DEVSTACK_WORKSPACE)/edx-e2e-tests/devstack_env edxops/e2e env TERM=$(TERM) bash -c 'paver e2e_test'
-
-e2e-tests.with-shell: dev.up.lms+studio+firefox+chrome ## Start the end-to-end tests container with a shell.
-	docker run -it --network=$(COMPOSE_PROJECT_NAME)_default -v $(DEVSTACK_WORKSPACE)/edx-e2e-tests:/edx-e2e-tests --env-file $(DEVSTACK_WORKSPACE)/edx-e2e-tests/devstack_env edxops/e2e env TERM=$(TERM) bash
-
 validate-lms-volume: ## Validate that changes to the local workspace are reflected in the LMS container.
 	touch $(DEVSTACK_WORKSPACE)/edx-platform/testfile
 	docker-compose exec -T lms ls /edx/app/edxapp/edx-platform/testfile

Makefile.edx

@@ -14,7 +14,7 @@
 .PHONY: backup check-memory destroy \
         dev.provision.services dev.repo.reset \
         dev.up.all dev.up.watchers down \
-        e2e-shell healthchecks lms-restart \
+        healthchecks lms-restart \
         lms-watcher-shell logs provision pull  \
         pull.xqueue restore static stats stop stop.all  \
         stop.watchers stop.xqueue studio-restart \
@@ -57,8 +57,6 @@ dev.up.watchers: dev.up.lms_watcher+studio_watcher
 
 down: dev.down
 
-e2e-shell: e2e-tests.with-shell
-
 healthchecks: dev.check
 
 lms-restart: dev.restart-devserver.lms

compatibility.mk

@@ -28,7 +28,6 @@ services:
     ports:
       - "15900:5900"
     volumes:  # for file uploads
-      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
       - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
   coursegraph:
@@ -149,7 +148,6 @@ services:
     ports:
       - "25900:5900"
     volumes:  # for file uploads
-      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
       - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
   # Events broker

docker-compose.yml

@@ -96,27 +96,4 @@ Most tests are run in Firefox by default.  To use Chrome for tests that normally
 use Firefox instead, prefix the test command with
 ``SELENIUM_BROWSER=chrome SELENIUM_HOST=edx.devstack.chrome``.
 
-Running End-to-End Tests
-------------------------
-
-To run the base set of end-to-end tests for edx-platform, run the following
-make target:
-
-.. code:: sh
-
-   make e2e-tests
-
-If you want to use some of the other testing options described in the
-`edx-e2e-tests README`_, you can instead start a shell for the e2e container
-and run the tests manually via paver:
-
-.. code:: sh
-
-    make e2e-shell
-    paver e2e_test
-
-The browser running the tests can be seen and interacted with via VNC as
-described above (Firefox is used by default).
-
 .. _edx-platform testing documentation: https://github.com/openedx/edx-platform/blob/master/docs/guides/testing/testing.rst#running-python-unit-tests
-.. _edx-e2e-tests README: https://github.com/edx/edx-e2e-tests/#how-to-run-lms-and-studio-tests

docs/testing_and_debugging.rst

@@ -42,7 +42,6 @@ lms \
 ecommerce \
 discovery \
 credentials \
-e2e \
 forum \
 notes \
 registrar \

provision-e2e.sh

@@ -25,7 +25,6 @@ repos=(
     "https://github.com/openedx/credentials.git"
     "https://github.com/openedx/cs_comments_service.git"
     "https://github.com/openedx/ecommerce.git"
-    "https://github.com/edx/edx-e2e-tests.git"
     "https://github.com/openedx/edx-notes-api.git"
     "https://github.com/openedx/edx-platform.git"
     "https://github.com/openedx/xqueue.git"
@@ -46,15 +45,14 @@ non_release_repos=(
     "https://github.com/openedx/frontend-app-program-console.git"
     "https://github.com/openedx/frontend-app-account.git"
     "https://github.com/openedx/frontend-app-profile.git"
-    "https://github.com/edx/frontend-app-ora-grading.git"
+    "https://github.com/openedx/frontend-app-ora-grading.git"
 )
 
 ssh_repos=(
     "git@github.com:openedx/course-discovery.git"
     "git@github.com:openedx/credentials.git"
     "git@github.com:openedx/cs_comments_service.git"
     "git@github.com:openedx/ecommerce.git"
-    "git@github.com:edx/edx-e2e-tests.git"
     "git@github.com:openedx/edx-notes-api.git"
     "git@github.com:openedx/edx-platform.git"
     "git@github.com:openedx/xqueue.git"
@@ -75,12 +73,7 @@ non_release_ssh_repos=(
     "git@github.com:openedx/frontend-app-program-console.git"
     "git@github.com:openedx/frontend-app-account.git"
     "git@github.com:openedx/frontend-app-profile.git"
-    "git@github.com:edx/frontend-app-ora-grading.git"
-)
-
-private_repos=(
-    # Needed to run whitelabel tests.
-    "https://github.com/edx/edx-themes.git"
+    "git@github.com:openedx/frontend-app-ora-grading.git"
 )
 
 if [ -n "${OPENEDX_RELEASE}" ]; then
@@ -184,11 +177,6 @@ clone_ssh ()
     _clone "${ssh_repos[@]}"
 }
 
-clone_private ()
-{
-    _clone "${private_repos[@]}"
-}
-
 reset ()
 {
     read -p "This will switch to the default branch and pull changes in your local git checkouts. Would you like to proceed? [y/n] " -r
@@ -249,8 +237,6 @@ elif [ "$1" == "clone" ]; then
     clone
 elif [ "$1" == "clone_ssh" ]; then
     clone_ssh
-elif [ "$1" == "whitelabel" ]; then
-    clone_private
 elif [ "$1" == "reset" ]; then
     reset
 elif [ "$1" == "status" ]; then

provision.sh

@@ -59,7 +59,7 @@ six==1.16.0
     #   websocket-client
 texttable==1.6.7
     # via docker-compose
-urllib3==2.0.2
+urllib3==2.0.3
     # via
     #   docker
     #   requests

repo.sh

@@ -73,7 +73,7 @@ exceptiongroup==1.1.1
     # via
     #   -r requirements/test.txt
     #   pytest
-filelock==3.12.0
+filelock==3.12.2
     # via
     #   tox
     #   virtualenv
@@ -109,7 +109,7 @@ pexpect==4.8.0
     # via -r requirements/test.txt
 pip-tools==6.13.0
     # via -r requirements/pip-tools.txt
-platformdirs==3.5.1
+platformdirs==3.5.3
     # via virtualenv
 pluggy==1.0.0
     # via
@@ -141,7 +141,7 @@ pyrsistent==0.19.3
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   jsonschema
-pytest==7.3.1
+pytest==7.3.2
     # via -r requirements/test.txt
 python-dotenv==0.21.1
     # via
@@ -187,7 +187,7 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/dev.in
-urllib3==2.0.2
+urllib3==2.0.3
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt