You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/07/02 14:48:04 UTC
[skywalking-python] branch pull/31 created (now 3a952b2)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch pull/31
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git.
at 3a952b2 Fix test
This branch includes the following new commits:
new 8efeca4 Merge branch 'master' into flask-plugin
new 3a952b2 Fix test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-python] 01/02: Merge branch 'master' into flask-plugin
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch pull/31
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
commit 8efeca4b1d993b53a81600d4cf167f12ca109248
Merge: d4167fb 1736c24
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Thu Jul 2 21:49:50 2020 +0800
Merge branch 'master' into flask-plugin
skywalking/trace/carrier/__init__.py | 19 ++++++++++++++++---
skywalking/trace/context/__init__.py | 2 +-
skywalking/trace/segment/__init__.py | 14 +++++++++++++-
skywalking/trace/span/__init__.py | 4 ++--
tests/plugin/sw_flask/test_flask.py | 1 -
5 files changed, 32 insertions(+), 8 deletions(-)
diff --cc tests/plugin/sw_flask/test_flask.py
index 21a191a,0000000..ab7354f
mode 100644,000000..100644
--- a/tests/plugin/sw_flask/test_flask.py
+++ b/tests/plugin/sw_flask/test_flask.py
@@@ -1,44 -1,0 +1,43 @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import os
+import time
+import unittest
+from os.path import abspath, dirname
+
- import requests
+from testcontainers.compose import DockerCompose
+
+from tests.plugin import BasePluginTest
+
+
+class TestRequestPlugin(BasePluginTest):
+ @classmethod
+ def setUpClass(cls):
+ cls.compose = DockerCompose(filepath=dirname(abspath(__file__)))
+ cls.compose.start()
+
+ cls.compose.wait_for(cls.url(('consumer', '9090'), 'users'))
+
+ def test_request_plugin(self):
+ time.sleep(3)
+
+ self.validate(expected_file_name=os.path.join(dirname(abspath(__file__)), 'expected.data.yml'))
+
+
+if __name__ == '__main__':
+ unittest.main()
[skywalking-python] 02/02: Fix test
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch pull/31
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
commit 3a952b222b001fb49c073e3cf2193b08ad4a88e3
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Thu Jul 2 22:47:48 2020 +0800
Fix test
---
tests/plugin/sw_flask/docker-compose.yml | 4 ++--
tests/plugin/sw_flask/test_flask.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/plugin/sw_flask/docker-compose.yml b/tests/plugin/sw_flask/docker-compose.yml
index d84ab67..61f3be7 100644
--- a/tests/plugin/sw_flask/docker-compose.yml
+++ b/tests/plugin/sw_flask/docker-compose.yml
@@ -25,7 +25,7 @@ services:
provider:
extends:
- service: provider
+ service: agent
file: ../docker/docker-compose.base.yml
ports:
- 9091:9091
@@ -43,7 +43,7 @@ services:
consumer:
extends:
- service: consumer
+ service: agent
file: ../docker/docker-compose.base.yml
ports:
- 9090:9090
diff --git a/tests/plugin/sw_flask/test_flask.py b/tests/plugin/sw_flask/test_flask.py
index ab7354f..dfeaaa6 100644
--- a/tests/plugin/sw_flask/test_flask.py
+++ b/tests/plugin/sw_flask/test_flask.py
@@ -25,7 +25,7 @@ from testcontainers.compose import DockerCompose
from tests.plugin import BasePluginTest
-class TestRequestPlugin(BasePluginTest):
+class TestPlugin(BasePluginTest):
@classmethod
def setUpClass(cls):
cls.compose = DockerCompose(filepath=dirname(abspath(__file__)))