From 18facbb7ee1c997b716fe87d47d56580ca900cdf Mon Sep 17 00:00:00 2001
From: Owais Lone <owais@lone.pw>
Date: Thu, 11 Nov 2021 00:11:42 +0530
Subject: [PATCH] Update core opentelemetry-tests subdirectory

---
 .github/workflows/test.yml | 4 ++--
 .python-version            | 1 -
 tox.ini                    | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 .python-version

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f4f7cf177..f146328e27 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: e65baa4680cd9dafc026ca5ed760e6d2c2232c96
+  CORE_REPO_SHA: f32b2161662d143fa8ec2b25539f31f2523296aa
 
 jobs:
   build:
@@ -82,7 +82,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.9.7
       - name: Install tox
         run: pip install -U tox
       - name: Install libsnappy-dev
diff --git a/.python-version b/.python-version
deleted file mode 100644
index 11aaa06863..0000000000
--- a/.python-version
+++ /dev/null
@@ -1 +0,0 @@
-3.9.5
diff --git a/tox.ini b/tox.ini
index 4f068ceb72..60bce25d9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -275,7 +275,7 @@ commands_pre =
   test: pip install "opentelemetry-api[test] @ {env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
   test: pip install "opentelemetry-semantic-conventions[test] @ {env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
   test: pip install "opentelemetry-sdk[test] @ {env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
-  test: pip install "opentelemetry-test[test] @ {env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/util"
+  test: pip install "opentelemetry-test[test] @ {env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/opentelemetry-tests"
   test: pip install {toxinidir}/opentelemetry-instrumentation
 
   distro: pip install {toxinidir}/opentelemetry-distro
@@ -403,7 +403,7 @@ commands_pre =
   python -m pip install "{env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
   python -m pip install "{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
   python -m pip install "{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
-  python -m pip install "{env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/util"
+  python -m pip install "{env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/opentelemetry-tests"
   python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test]
   python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
@@ -476,7 +476,7 @@ commands_pre =
   pip install "{env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api" \
               "{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions" \
               "{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk" \
-              "{env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/util" \
+              "{env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/opentelemetry-tests" \
               -e {toxinidir}/opentelemetry-instrumentation \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg \
               -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery \