Attachment 6403 Details for Bug 36797

[patch] Fix UCS@School tests v2

36797_jenkins-ucsschool.patch (text/plain), 9.95 KB, created by Philipp Hahn on 2014-11-18 11:24 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-11-18 11:24 CET

Size: 9.95 KB

patch

obsolete

>From 1c088df09bce9c0833e401a65011ed419371767d Mon Sep 17 00:00:00 2001
>Message-Id: <1c088df09bce9c0833e401a65011ed419371767d.1416306213.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 18 Nov 2014 10:53:19 +0100
>Subject: [PATCH] Bug #36797 test: Fix files for Jenkins
>Organization: Univention GmbH, Bremen, Germany
>
>Test files MUST NOT contain dots as they are used for class/method
>separation!
>
>Fix executable file permission.
>
>Fix abuse of Python multi-lines string terminators.
>---
> ...ED => 08_ucs-school-printermoderatoion-find-printer-in-ou-check} | 2 +-
> ...ave_automatic_srv_record.py => 16_s4_slave_automatic_srv_record} | 0
> .../ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/61_samba_login   | 0
> .../90_ucsschool/74_radius_internetrules_priority                   | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/__init__.py           | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/check.py              | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/distribution.py       | 5 ++---
> .../ucs-test-ucsschool/90_ucsschool/essential/exam.py               | 5 ++---
> .../ucs-test-ucsschool/90_ucsschool/essential/internetrule.py       | 5 ++---
> .../ucs-test-ucsschool/90_ucsschool/essential/klasse.py             | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/randomdomain.py       | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/school.py             | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/simplecurl.py         | 0
> .../ucs-test-ucsschool/90_ucsschool/essential/workgroup.py          | 0
> branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/changelog | 6 ++++++
> branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/rules     | 3 ++-
> 16 files changed, 15 insertions(+), 11 deletions(-)
> rename branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/{08_ucs-school-printermoderatoion-find-printer-in-ou-check.DISABLED => 08_ucs-school-printermoderatoion-find-printer-in-ou-check} (98%)
> rename branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/{16_s4_slave_automatic_srv_record.py => 16_s4_slave_automatic_srv_record} (100%)
> mode change 100644 => 100755 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/61_samba_login
> mode change 100644 => 100755 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/74_radius_internetrules_priority
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/__init__.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/check.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/internetrule.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/klasse.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/randomdomain.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/school.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/simplecurl.py
> mode change 100755 => 100644 branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/workgroup.py
>
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/08_ucs-school-printermoderatoion-find-printer-in-ou-check.DISABLED b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/08_ucs-school-printermoderatoion-find-printer-in-ou-check
>similarity index 98%
>rename from branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/08_ucs-school-printermoderatoion-find-printer-in-ou-check.DISABLED
>rename to branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/08_ucs-school-printermoderatoion-find-printer-in-ou-check
>index 4f690d3..047eb1c 100755
>--- a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/08_ucs-school-printermoderatoion-find-printer-in-ou-check.DISABLED
>+++ b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/08_ucs-school-printermoderatoion-find-printer-in-ou-check
>@@ -1,7 +1,7 @@
> #!/usr/share/ucs-test/runner python
> ## desc: ucs-school-printermoderatoion-find-printer-in-ou-check
> ## roles: [domaincontroller_master, domaincontroller_backup, domaincontroller_slave, memberserver]
>-## tags: [apptest,ucsschool]
>+## tags: [apptest,ucsschool,skip]
> ## exposure: dangerous
> ## packages:  [ucs-school-umc-printermoderation]
> 
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/16_s4_slave_automatic_srv_record.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/16_s4_slave_automatic_srv_record
>similarity index 100%
>rename from branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/16_s4_slave_automatic_srv_record.py
>rename to branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/16_s4_slave_automatic_srv_record
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/61_samba_login b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/61_samba_login
>old mode 100644
>new mode 100755
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/74_radius_internetrules_priority b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/74_radius_internetrules_priority
>old mode 100644
>new mode 100755
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/__init__.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/__init__.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/check.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/check.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py
>index b9e5c6d..ccb7868 100644
>--- a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py
>+++ b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/distribution.py
>@@ -1,7 +1,6 @@
>-"""""""""""""""""""""""""""""""""""""""
>-  **Class Distribution**\n
>-"""""""""""""""""""""""""""""""""""""""
> """
>+  **Class Distribution**\n
>+
> .. module:: distribution
> 	:platform: Unix
> 
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/exam.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/exam.py
>index 31f8aa2..8826aff 100644
>--- a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/exam.py
>+++ b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/exam.py
>@@ -1,7 +1,6 @@
>-"""""""""""""""""""""""""""""""""""""""
>-  **Class Exam**\n
>-"""""""""""""""""""""""""""""""""""""""
> """
>+  **Class Exam**\n
>+
> .. module:: exam
> 	:platform: Unix
> 
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/internetrule.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/internetrule.py
>old mode 100755
>new mode 100644
>index 6381ef0..6689f3c
>--- a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/internetrule.py
>+++ b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/internetrule.py
>@@ -1,8 +1,7 @@
>-"""""""""""""""""""""""""""""""""""""""
>+"""
>   **Class InternetRule**\n
>   All the operations related to internet rules
>-"""""""""""""""""""""""""""""""""""""""
>-"""
>+
> .. module:: internetrule
> 	:platform: Unix
> 
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/klasse.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/klasse.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/randomdomain.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/randomdomain.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/school.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/school.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/simplecurl.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/simplecurl.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/workgroup.py b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/90_ucsschool/essential/workgroup.py
>old mode 100755
>new mode 100644
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/changelog b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/changelog
>index f872f2d..3dfc00f 100644
>--- a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/changelog
>+++ b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/changelog
>@@ -1,3 +1,9 @@
>+ucs-test-ucsschool (2.0.4-1) unstable; urgency=low
>+
>+  * Bug #36797: Fix files for Jenkins
>+
>+ -- Philipp Hahn <hahn@univention.de>  Tue, 18 Nov 2014 10:51:31 +0100
>+
> ucs-test-ucsschool (2.0.3-1) unstable; urgency=medium
> 
>   * essential/computerroom.py: removed samba restart (Bug #35150)
>diff --git a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/rules b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/rules
>index b344c65..2df7357 100755
>--- a/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/rules
>+++ b/branches/ucs-4.0/ucs-school-4.0/ucs-test-ucsschool/debian/rules
>@@ -33,8 +33,9 @@
> export DH_ALWAYS_EXCLUDE=.svn
> 
> override_dh_auto_test:
>-	dh_auto_test
> 	ucslint
>+	! find -type f -exec grep '^source\>' {} +
>+	find 90_ucsschool -name .svn -prune -o -type f $ \( -perm -0755 -exec grep -q '^#! */usr/share/ucs-test/runner ' {} \; -prune $ -o $ -not -perm /0111 -not -exec grep -q '^#! */usr/share/ucs-test/runner ' {} \; -prune $ -o -ls \)
> 
> %:
> 	dh $@ --with python_support
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 36797: 6402 | 6403