Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #12081: The filter field in the technique editor should not be monospace #746

Conversation

RaphaelGauthier
Copy link
Member

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/746
-- Your faithful QA

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/746
-- Your faithful QA

1 similar comment
@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/746
-- Your faithful QA

@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Your branch is up-to-date with 'NRM/branches/rudder/4.1'.
Already up-to-date.
Deleted branch 4.1_test (was 1262a30).
Updating 1a45161..1262a30
[...]
  File "test_ncf.py", line 314, in test_generate_technique_content
    self.assertEqual(self.technique_test_expected_content, content)
AssertionError: '# @name ncf technique method argument escape test\n# @description This is a bundle to test ncf\'s Python lib\n# @version 0.1\n\nbundle agent content_escaping_test\n{\n  methods:\n    "method_call" usebundle => package_install_version("apache2", "2.2.11"),\n      ifvarclass => concat("any");\n    "method_call" usebundle => file_replace_lines("/etc/httpd/conf/httpd.conf", "ErrorLog \\"/var/log/httpd/error_log\\"", "ErrorLog \\"/projet/logs/httpd/error_log\\""),\n      ifvarclass => concat("redhat");\n}\n' != '# @name ncf technique method argument escape test\n# @description This is a bundle to test ncf\'s Python lib\n# @version 0.1\n\nbundle agent content_escaping_test\n{\n  vars:\n    "class_prefix" string => canonify(join("_", "this.callers_promisers"));\n\n  methods:\n    "method_call" usebundle => package_install_version("apache2", "2.2.11"),\n      ifvarclass => concat("any");\n    "method_call" usebundle => file_replace_lines("/etc/httpd/conf/httpd.conf", "ErrorLog \\"/var/log/httpd/error_log\\"", "ErrorLog \\"/projet/logs/httpd/error_log\\""),\n      ifvarclass => concat("redhat");\n}\n'

----------------------------------------------------------------------
Ran 29 tests in 3.139s

FAILED (failures=1)
make: *** [test-common] Error 1

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/ncf/pull/746 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA

@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Your branch is up-to-date with 'NRM/branches/rudder/4.1'.
Already up-to-date.
Deleted branch 4.1_test (was 1a45161).
Updating 1a45161..1262a30
[...]
  File "test_ncf.py", line 314, in test_generate_technique_content
    self.assertEqual(self.technique_test_expected_content, content)
AssertionError: '# @name ncf technique method argument escape test\n# @description This is a bundle to test ncf\'s Python lib\n# @version 0.1\n\nbundle agent content_escaping_test\n{\n  vars:\n    "class_prefix" string => canonify(join("_", "this.callers_promisers"));\n\n  methods:\n    "method_call" usebundle => package_install_version("apache2", "2.2.11"),\n      ifvarclass => concat("any");\n    "method_call" usebundle => file_replace_lines("/etc/httpd/conf/httpd.conf", "ErrorLog \\"/var/log/httpd/error_log\\"", "ErrorLog \\"/projet/logs/httpd/error_log\\""),\n      ifvarclass => concat("redhat");\n}\n' != '# @name ncf technique method argument escape test\n# @description This is a bundle to test ncf\'s Python lib\n# @version 0.1\n\nbundle agent content_escaping_test\n{\n  methods:\n    "method_call" usebundle => package_install_version("apache2", "2.2.11"),\n      ifvarclass => concat("any");\n    "method_call" usebundle => file_replace_lines("/etc/httpd/conf/httpd.conf", "ErrorLog \\"/var/log/httpd/error_log\\"", "ErrorLog \\"/projet/logs/httpd/error_log\\""),\n      ifvarclass => concat("redhat");\n}\n'

----------------------------------------------------------------------
Ran 29 tests in 4.974s

FAILED (failures=1, errors=1)
make: *** [test-common] Error 1

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/ncf/pull/746 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA

@Normation-Quality-Assistant
Copy link
Contributor

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit 1262a30 into Normation:branches/rudder/4.1 Apr 26, 2018
@VinceMacBuche
Copy link
Member

@Normation-Quality-Assistant , you are completely drunk

@amousset
Copy link
Member

😮

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants