Skip to content

Commit

Permalink
Prepare for 2019.12.0
Browse files Browse the repository at this point in the history
robotkernel = 1.2
robotframework-seleniumlibrary = 4.1.0
jupyterlab = 1.2.3
@jupyter-widgets/jupyter-labmanager = 1.1.0
jupytext = 1.3.0
robotframework-seleniumtestability = 0.0.15
  • Loading branch information
datakurre authored Dec 6, 2019
1 parent 0165561 commit 00701c0
Show file tree
Hide file tree
Showing 16 changed files with 379 additions and 20 deletions.
3 changes: 1 addition & 2 deletions anaconda-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ env_specs:
- ripgrep
- robotframework
- robotframework-seleniumlibrary >=4.1.0,<5
- robotframework-seleniumtestability >=0.0.15,<1

_lab:
packages:
- jupyterlab ==1.1.4
- jupyterlab ==1.2.3
- nodejs >=11,<12
- python >=3.6,<3.7.0a0

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trigger:
pr: [master]

variables:
ROBOTLAB_VERSION: 2019.9.1
ROBOTLAB_VERSION: 2019.12.0
PYTHONUNBUFFERED: 1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion ci/env-lab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channels:
dependencies:
- black
- flake8
- jupyterlab ==1.1.4
- jupyterlab ==1.2.3
- nodejs >=11,<12
- python >=3.6,<3.7.0a0
- python >=3.6,<3.7.0a0
Expand Down
5 changes: 3 additions & 2 deletions ci/job.noarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ jobs:
- script: |-
python -m scripts.build conda \
--no-test \
robotframework \
restinstance \
robotframework-jupyterlibrary \
robotframework-seleniumscreenshots \
robotkernel \
robotframework-ride
robotframework-seleniumtestability \
robotkernel
displayName: build noarch packages
- task: PublishPipelineArtifact@0
Expand Down
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ dependencies:
- ripgrep
- robotframework
- robotframework-seleniumlibrary >=4.1.0,<5
- robotframework-seleniumtestability >=0.0.15,<1
42 changes: 42 additions & 0 deletions recipes/robotframework-seleniumtestability/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{% set name = "robotframework-seleniumtestability" %}
{% set version = "0.0.15" %}

package:
name: {{ name }}
version: {{ version }}

source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: a49df9eb970f95794ab6af12b8a51312340d8349e7b92bf2b59021898b40e1c0

build:
number: 0
noarch: python
script:
- {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv

requirements:
host:
- pip
- python
run:
- furl
- python
- robotframework-seleniumlibrary >=4.0.0
- wrapt

test:
imports:
- SeleniumTestability
- SeleniumTestability.javascript
- SeleniumTestability.listener
- SeleniumTestability.logger
- SeleniumTestability.plugin
- SeleniumTestability.types

about:
home: https://github.com/rasjani/robotframework-seleniumtestability
license: Apache-2.0
license_file: LICENSE
license_family: Apache
summary: Extension for SeleniumLibrary that provides manual and automatic waiting for asyncronous events like fetch, xhr, etc.
222 changes: 222 additions & 0 deletions recipes/robotframework/70af9e3bab0217b0450d78c69e6c2ccb8f9c342d.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
From 70af9e3bab0217b0450d78c69e6c2ccb8f9c342d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pekka=20Kl=C3=A4rck?= <[email protected]>
Date: Tue, 22 Oct 2019 21:53:33 +0300
Subject: [PATCH] Python 3.8 utest fixes: Consistent XML attributes order

---
utest/result/golden.xml | 24 ++++++-------
utest/result/goldenTwice.xml | 50 +++++++++++++--------------
utest/result/test_resultserializer.py | 3 ++
3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/utest/result/golden.xml b/utest/result/golden.xml
index 6703b889b..a8e0b706c 100644
--- a/utest/result/golden.xml
+++ b/utest/result/golden.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<robot rpa="false" generated="20111024 13:41:20.873" generator="Robot trunk 20111007 (Python 2.7.2 on linux2)">
-<suite id="s1" source="normal.html" name="Normal">
-<kw type="setup" name="my setup">
+<suite id="s1" name="Normal" source="normal.html">
+<kw name="my setup" type="setup">
<timeout value="1 year"></timeout>
-<status status="PASS" endtime="20111024 13:41:20.888" starttime="20111024 13:41:20.886"></status>
+<status endtime="20111024 13:41:20.888" starttime="20111024 13:41:20.886" status="PASS"></status>
</kw>
<test id="s1-t1" name="First One">
<kw library="BuiltIn" name="Log">
@@ -11,8 +11,8 @@
<arguments>
<arg>Test 1</arg>
</arguments>
-<msg timestamp="20111024 13:41:20.927" level="INFO">Test 1</msg>
-<status status="PASS" endtime="20111024 13:41:20.928" starttime="20111024 13:41:20.926"></status>
+<msg level="INFO" timestamp="20111024 13:41:20.927">Test 1</msg>
+<status endtime="20111024 13:41:20.928" starttime="20111024 13:41:20.926" status="PASS"></status>
</kw>
<kw name="logs on trace">
<tags>
@@ -27,21 +27,21 @@
<arg>Log on ${TEST NAME}</arg>
<arg>TRACE</arg>
</arguments>
-<status status="PASS" endtime="20111024 13:41:20.932" starttime="20111024 13:41:20.931"></status>
+<status endtime="20111024 13:41:20.932" starttime="20111024 13:41:20.931" status="PASS"></status>
</kw>
-<status status="PASS" endtime="20111024 13:41:20.933" starttime="20111024 13:41:20.930"></status>
+<status endtime="20111024 13:41:20.933" starttime="20111024 13:41:20.930" status="PASS"></status>
</kw>
<doc>Test case documentation</doc>
<tags>
<tag>t1</tag>
</tags>
-<status status="PASS" endtime="20111024 13:41:20.934" critical="yes" starttime="20111024 13:41:20.925"></status>
+<status critical="yes" endtime="20111024 13:41:20.934" starttime="20111024 13:41:20.925" status="PASS"></status>
</test>
<doc>Normal test cases</doc>
<metadata>
<item name="Something">My Value</item>
</metadata>
-<status status="PASS" endtime="20111024 13:41:20.952" starttime="20111024 13:41:20.873"></status>
+<status endtime="20111024 13:41:20.952" starttime="20111024 13:41:20.873" status="PASS"></status>
</suite>
<statistics>
<total>
@@ -49,13 +49,13 @@
<stat fail="0" pass="1">All Tests</stat>
</total>
<tag>
-<stat pass="1" fail="0">t1</stat>
+<stat fail="0" pass="1">t1</stat>
</tag>
<suite>
-<stat fail="0" name="Normal" id="s1" pass="1">Normal</stat>
+<stat fail="0" id="s1" name="Normal" pass="1">Normal</stat>
</suite>
</statistics>
<errors>
- <msg timestamp="20111024 13:41:20.873" level="ERROR">Error in file 'normal.html' in table 'Settings': Resource file 'nope' does not exist.</msg>
+ <msg level="ERROR" timestamp="20111024 13:41:20.873">Error in file 'normal.html' in table 'Settings': Resource file 'nope' does not exist.</msg>
</errors>
</robot>
diff --git a/utest/result/goldenTwice.xml b/utest/result/goldenTwice.xml
index ea60eca81..b5f117079 100644
--- a/utest/result/goldenTwice.xml
+++ b/utest/result/goldenTwice.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<robot generated="20111027 10:11:57.563" generator="Rebot trunk 20111007 (Python 2.7.2+ on linux2)">
<suite id="s1" name="Normal &amp; Normal">
-<suite id="s1-s1" source="normal.html" name="Normal">
-<kw type="setup" name="my setup">
+<suite id="s1-s1" name="Normal" source="normal.html">
+<kw name="my setup" type="setup">
<timeout value="1 year"></timeout>
-<status status="PASS" endtime="20111024 13:41:20.888" starttime="20111024 13:41:20.886"></status>
+<status endtime="20111024 13:41:20.888" starttime="20111024 13:41:20.886" status="PASS"></status>
</kw>
<test id="s1-s1-t1" name="First One">
<kw library="BuiltIn" name="Log">
@@ -12,8 +12,8 @@
<arguments>
<arg>Test 1</arg>
</arguments>
-<msg timestamp="20111024 13:41:20.927" level="INFO">Test 1</msg>
-<status status="PASS" endtime="20111024 13:41:20.928" starttime="20111024 13:41:20.926"></status>
+<msg level="INFO" timestamp="20111024 13:41:20.927">Test 1</msg>
+<status endtime="20111024 13:41:20.928" starttime="20111024 13:41:20.926" status="PASS"></status>
</kw>
<kw name="logs on trace">
<tags>
@@ -28,26 +28,26 @@
<arg>Log on ${TEST NAME}</arg>
<arg>TRACE</arg>
</arguments>
-<status status="PASS" endtime="20111024 13:41:20.932" starttime="20111024 13:41:20.931"></status>
+<status endtime="20111024 13:41:20.932" starttime="20111024 13:41:20.931" status="PASS"></status>
</kw>
-<status status="PASS" endtime="20111024 13:41:20.933" starttime="20111024 13:41:20.930"></status>
+<status endtime="20111024 13:41:20.933" starttime="20111024 13:41:20.930" status="PASS"></status>
</kw>
<doc>Test case documentation</doc>
<tags>
<tag>t1</tag>
</tags>
-<status status="PASS" endtime="20111024 13:41:20.934" critical="yes" starttime="20111024 13:41:20.925"></status>
+<status critical="yes" endtime="20111024 13:41:20.934" starttime="20111024 13:41:20.925" status="PASS"></status>
</test>
<doc>Normal test cases</doc>
<metadata>
<item name="Something">My Value</item>
</metadata>
-<status status="PASS" endtime="20111024 13:41:20.952" starttime="20111024 13:41:20.873"></status>
+<status endtime="20111024 13:41:20.952" starttime="20111024 13:41:20.873" status="PASS"></status>
</suite>
-<suite id="s1-s2" source="normal.html" name="Normal">
-<kw type="setup" name="my setup">
+<suite id="s1-s2" name="Normal" source="normal.html">
+<kw name="my setup" type="setup">
<timeout value="1 year"></timeout>
-<status status="PASS" endtime="20111024 13:41:20.888" starttime="20111024 13:41:20.886"></status>
+<status endtime="20111024 13:41:20.888" starttime="20111024 13:41:20.886" status="PASS"></status>
</kw>
<test id="s1-s2-t1" name="First One">
<kw library="BuiltIn" name="Log">
@@ -55,8 +55,8 @@
<arguments>
<arg>Test 1</arg>
</arguments>
-<msg timestamp="20111024 13:41:20.927" level="INFO">Test 1</msg>
-<status status="PASS" endtime="20111024 13:41:20.928" starttime="20111024 13:41:20.926"></status>
+<msg level="INFO" timestamp="20111024 13:41:20.927">Test 1</msg>
+<status endtime="20111024 13:41:20.928" starttime="20111024 13:41:20.926" status="PASS"></status>
</kw>
<kw name="logs on trace">
<tags>
@@ -71,23 +71,23 @@
<arg>Log on ${TEST NAME}</arg>
<arg>TRACE</arg>
</arguments>
-<status status="PASS" endtime="20111024 13:41:20.932" starttime="20111024 13:41:20.931"></status>
+<status endtime="20111024 13:41:20.932" starttime="20111024 13:41:20.931" status="PASS"></status>
</kw>
-<status status="PASS" endtime="20111024 13:41:20.933" starttime="20111024 13:41:20.930"></status>
+<status endtime="20111024 13:41:20.933" starttime="20111024 13:41:20.930" status="PASS"></status>
</kw>
<doc>Test case documentation</doc>
<tags>
<tag>t1</tag>
</tags>
-<status status="PASS" endtime="20111024 13:41:20.934" critical="yes" starttime="20111024 13:41:20.925"></status>
+<status critical="yes" endtime="20111024 13:41:20.934" starttime="20111024 13:41:20.925" status="PASS"></status>
</test>
<doc>Normal test cases</doc>
<metadata>
<item name="Something">My Value</item>
</metadata>
-<status status="PASS" endtime="20111024 13:41:20.952" starttime="20111024 13:41:20.873"></status>
+<status endtime="20111024 13:41:20.952" starttime="20111024 13:41:20.873" status="PASS"></status>
</suite>
-<status status="PASS" elapsedtime="158" endtime="N/A" starttime="N/A"></status>
+<status elapsedtime="158" endtime="N/A" starttime="N/A" status="PASS"></status>
</suite>
<statistics>
<total>
@@ -95,16 +95,16 @@
<stat fail="0" pass="2">All Tests</stat>
</total>
<tag>
-<stat pass="2" fail="0">t1</stat>
+<stat fail="0" pass="2">t1</stat>
</tag>
<suite>
-<stat fail="0" name="Normal &amp; Normal" id="s1" pass="2">Normal &amp; Normal</stat>
-<stat fail="0" name="Normal" id="s1-s1" pass="1">Normal &amp; Normal.Normal</stat>
-<stat fail="0" name="Normal" id="s1-s2" pass="1">Normal &amp; Normal.Normal</stat>
+<stat fail="0" id="s1" name="Normal &amp; Normal" pass="2">Normal &amp; Normal</stat>
+<stat fail="0" id="s1-s1" name="Normal" pass="1">Normal &amp; Normal.Normal</stat>
+<stat fail="0" id="s1-s2" name="Normal" pass="1">Normal &amp; Normal.Normal</stat>
</suite>
</statistics>
<errors>
-<msg timestamp="20111024 13:41:20.873" level="ERROR">Error in file 'normal.html' in table 'Settings': Resource file 'nope' does not exist.</msg>
-<msg timestamp="20111024 13:41:20.873" level="ERROR">Error in file 'normal.html' in table 'Settings': Resource file 'nope' does not exist.</msg>
+<msg level="ERROR" timestamp="20111024 13:41:20.873">Error in file 'normal.html' in table 'Settings': Resource file 'nope' does not exist.</msg>
+<msg level="ERROR" timestamp="20111024 13:41:20.873">Error in file 'normal.html' in table 'Settings': Resource file 'nope' does not exist.</msg>
</errors>
</robot>
diff --git a/utest/result/test_resultserializer.py b/utest/result/test_resultserializer.py
index e55679801..e310cf20f 100644
--- a/utest/result/test_resultserializer.py
+++ b/utest/result/test_resultserializer.py
@@ -15,6 +15,9 @@

class StreamXmlWriter(XmlWriter):

+ def _order_attrs(self, attrs):
+ return sorted(attrs)
+
def _create_output(self, output):
return output

Loading

0 comments on commit 00701c0

Please sign in to comment.