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:05 UTC

[skywalking-python] 01/02: Merge branch 'master' into flask-plugin

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()