unused

revision.txt

@@ -1 +1 @@
-dd1f3005
+44290aca

tests/tests_waptpackage.py

@@ -20,7 +20,7 @@
 #    along with WAPT.  If not, see <http://www.gnu.org/licenses/>.
 #
 # -----------------------------------------------------------------------
-__version__ = "1.7.2.0"
+__version__ = "1.7.3.11"
 import logging
 import sys
 import tempfile
@@ -695,8 +695,10 @@ def test_hook_action():
     print('Done')
 
 def test_update_crl():
-    cabundle = SSLCABundle('c:/private')
-    cabundle.update_crl(force=True)
+    cabundle = SSLCABundle('c:/wapt/ssl')
+    w = Wapt(config_filename='c:/wapt/wapt-get.ini')
+    proxies = w.proxies
+    cabundle.update_crl(force=True,proxies=proxies)
     print cabundle.crls
     crl = cabundle.crls[0]
     print cabundle.crl_for_authority_key_identifier(crl.authority_key_identifier)
@@ -1319,7 +1321,90 @@ def test_capabilities():
     print('not matching: %s' % len(res[False]))
     print('matching: %s' % len(res[True]))
 
+def test_sorted_packages():
+    r = WaptRemoteRepo('http://wapt/wapt')
+    q = PackageRequest('tis-firefox(<=65.0)',locales=['it','en','fr'],architectures=['x64'])
+    l = r.packages_matching(q)
+    l = (sorted(l,cmp=lambda p1,p2: q.compare_packages(p1,p2)))
+    print('\n'.join([p.filename for p in l]))
+
+def test_installed():
+    w = Wapt()
+    i = w.installed()
+    print(i[0].as_dict())
+
+def test_list_upgrades():
+    w = Wapt()
+    l = w.list_upgrade()
+    w.upgrade()
+    print(l)
+
+
+def test_check_remove():
+    w = Wapt()
+    print(w.check_remove('tis-7zip'))
+
+
+def test_localurl():
+    l = WaptLocalRepo('C:\\tranquilit\\wapt\\cache')
+    l.update_packages_index()
+    print([p.download_url for p in l.packages()])
+
+def test_wua_uninstall():
+    from waptenterprise.waptwua import client
+    w = Wapt()
+    with client.WaptWUA(w) as c:
+        c.uninstall_updates(uuids=['e6d0d744-94c8-41ef-be48-18e24ac5f89f_200'])
+
+
+def test_client_auth_cert():
+    cak = SSLPrivateKey(u'c:/private/CA-Developpeurs.pem',password='calimero')
+    cac = SSLCertificate(u'c:/private/CA-Developpeurs.crt')
+    k = SSLPrivateKey(u'c:/private/htouvet-dev2.pem',password='calimero')
+    c = k.build_sign_certificate(cak,cac,'htouvet-dev2','Dev','Tranquil IT',is_client_auth=True,is_ca=False)
+    c.save_as_pem(u'c:/private/htouvet-dev2.crt')
+
+    w = Wapt()
+    w.waptserver.client_certificate = u'c:/private/htouvet-dev2.crt'
+    w.waptserver.client_private_key = u'c:/private/htouvet-dev2.pem'
+
+    print(w.waptserver.get('ping'))
+
+def test_client_auth_download():
+    w = Wapt(config_filename='c:/wapt/wapt-get.ini')
+    print(w.waptserver.get('ping'))
+    print(w.download_packages('ht-7zip',usecache=False))
+
+def test_register():
+    w = Wapt(config_filename='c:/wapt/wapt-get.ini')
+    w.register_computer()
+
+
+def test_update_perf():
+    w = Wapt()
+    print(len(w.repositories[0].packages()))
+    previous = w.waptdb.known_packages()
+    current_uuid = [p.package_uuid for p in w.waptdb.known_packages()]
+    previous_uuid = [p.package_uuid for p in w.waptdb.known_packages()]
+    print([ p for p in previous if not p in current])
+    print(len(current))
+    print([r.repo_url for r in self.repositories])
+    print(self.list_upgrade())
+
+
 if __name__ == '__main__':
+    test_update_perf()
+    #test_register()
+    #test_client_auth_download()
+    #test_update_crl()
+    #test_crl()
+    #test_client_auth_cert()
+    #test_wua_uninstall()
+    #test_localurl()
+    #test_check_remove()
+    #test_list_upgrades()
+    #test_installed()
+    #test_sorted_packages()
     #gen_perso('htouvet',email='[email protected]')
     #test_discarded()
     #test_wuarules()
@@ -1328,7 +1413,7 @@ def test_capabilities():
     #test_fix_wmi()
     #test_processes_for_file()
     #test_status_hashes()
-    test_capabilities()
+    #test_capabilities()
     #test_wuaprogress()
     #test_certificate_expire()
     #test_install_only_not_running()

wapt-get/WaptGuiHelper.lpi

@@ -28,9 +28,9 @@
       <UseVersionInfo Value="True" />
       <MajorVersionNr Value="1" />
       <MinorVersionNr Value="7" />
-      <RevisionNr Value="3" />
-      <StringTable FileDescription="WAPT GUI Helper for python dialogs" LegalCopyright="Tranquil IT Systems 2012-2019" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.3" />
-    <BuildNr Value="8" /></VersionInfo>
+      <RevisionNr Value="4" />
+      <StringTable FileDescription="WAPT GUI Helper for python dialogs" LegalCopyright="Tranquil IT Systems 2012-2019" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.4" />
+    <BuildNr Value="6008" /></VersionInfo>
     <BuildModes Count="1">
       <Item1 Default="True" Name="Default" />
     </BuildModes>

wapt-get/waptget.lpi

@@ -22,9 +22,9 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
       <MinorVersionNr Value="7"/>
-      <RevisionNr Value="3"/>
-      <BuildNr Value="12"/>
-      <StringTable CompanyName="Tranquil IT Systems" LegalCopyright="Tranquil IT Systems 2012-2019" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.3"/>
+      <RevisionNr Value="4"/>
+      <BuildNr Value="6009"/>
+      <StringTable CompanyName="Tranquil IT Systems" LegalCopyright="Tranquil IT Systems 2012-2019" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.4"/>
     </VersionInfo>
     <BuildModes Count="1" Active="Default">
       <Item1 Name="Default" Default="True"/>
@@ -37,7 +37,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <CommandLineParams Value="-S update --force"/>
+        <CommandLineParams Value="-S install tis-getty"/>
       </local>
     </RunParams>
     <RequiredPackages Count="4">
@@ -58,12 +58,10 @@
       <Unit0>
         <Filename Value="waptget.lpr"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="685"/>
-        <CursorPos X="18" Y="706"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="85"/>
+        <CursorPos X="20" Y="93"/>
         <UsageCount Value="222"/>
-        <Bookmarks Count="1">
-          <Item0 X="13" Y="504" ID="2"/>
-        </Bookmarks>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit0>

wapt-get/waptget.psproj

@@ -1,5 +1,5 @@
 [PyScripter]
-Version=3.5.2.0
+Version=3.6.0.0
 
 [Project]
 ClassName=TProjectRootNode
@@ -108,7 +108,7 @@ ScriptName=C:\tranquilit\wapt\wapt-get.py
 Description=wapt-get update
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=-f -D update
+Parameters=-D update -l debug
 WorkingDir=$[ActiveScript-Dir]
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
@@ -1456,8 +1456,71 @@ ApplicationName=$[PythonExe-Short]
 Parameters=$[ActiveScript-Short]
 WorkingDirectory=$[ActiveScript-Dir]
 
+[Project\ChildNodes\Node1\ChildNodes\Node64]
+ClassName=TProjectRunConfiguationNode
+Name=audto tis-chrome
+
+[Project\ChildNodes\Node1\ChildNodes\Node64\RunConfig]
+ScriptName=C:\tranquilit\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=audit tis-chrome
+WorkingDir=$[ActiveScript-Dir]
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node64\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+
+[Project\ChildNodes\Node1\ChildNodes\Node65]
+ClassName=TProjectRunConfiguationNode
+Name=upload-package ssl
+
+[Project\ChildNodes\Node1\ChildNodes\Node65\RunConfig]
+ScriptName=C:\tranquilit\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=upload-package c:\waptdev\ht-putty_0.70-7_all.wapt -c locale
+WorkingDir=$[ActiveScript-Dir]
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node65\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+
+[Project\ChildNodes\Node1\ChildNodes\Node66]
+ClassName=TProjectRunConfiguationNode
+Name=build test
+
+[Project\ChildNodes\Node1\ChildNodes\Node66\RunConfig]
+ScriptName=C:\tranquilit\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=make-template test
+WorkingDir=$[ActiveScript-Dir]
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node66\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+
 [Project\ChildNodes\Node1\ChildNodes]
-Count=64
+Count=67
 
 [Project\ChildNodes]
 Count=2

wapt.psproj

@@ -1,5 +1,5 @@
 [PyScripter]
-Version=3.2.2.0
+Version=3.6.0.0
 
 [Project]
 ClassName=TProjectRootNode
@@ -55,7 +55,7 @@ Name=update
 ScriptName=$[Project-Path]wapt-get.py
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=update -L en
+Parameters=update -L en -j
 WorkingDir=$[ActiveScript-Dir]
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
@@ -67,8 +67,6 @@ Description=Run script using an external Python Interpreter
 ApplicationName=$[PythonExe-Short]
 Parameters=$[ActiveScript-Short]
 WorkingDirectory=$[ActiveScript-Dir]
-ShortCut=0
-MessagesFormat=$[FileName] $[LineNumber]
 
 [Project\ChildNodes\Node1\ChildNodes\Node1]
 ClassName=TProjectRunConfiguationNode
@@ -90,11 +88,30 @@ Description=Run script using an external Python Interpreter
 ApplicationName=$[PythonExe-Short]
 Parameters=$[ActiveScript-Short]
 WorkingDirectory=$[ActiveScript-Dir]
-ShortCut=0
-MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node2]
+ClassName=TProjectRunConfiguationNode
+Name=register srvwapt.ad.tranquil.it
+
+[Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig]
+ScriptName=C:\tranquilit\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=register --wapt-server-url=srvwapt.ad.tranquil.it --wapt-repo-url=srvwapt.ad.tranquil.it --use-gui --update --pin-server-cert -ldebug
+WorkingDir=$[ActiveScript-Dir]
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
 
 [Project\ChildNodes\Node1\ChildNodes]
-Count=2
+Count=3
 
 [Project\ChildNodes]
 Count=2

waptconsole.sha256

@@ -172,7 +172,7 @@ a7539655c368457fdde002774d34883ab14fbe0b8278f19b953ef564d8bf5a26  lib\site-packa
 8c7b15a256e23a35ef72e6bdb6b874dbfb730bcc5057475c9fd88987de20c9e1  lib\site-packages\cryptography\x509\general_name.py
 9c20eef2a3df28a5d7bd54184132e53e23e8be6a28e4f2b74560cbd9dafc24e1  lib\site-packages\cryptography\x509\name.py
 f4eba8fcfeddaf98242a840438c8f83d3c786b159af14e4b358ba604160ed3b0  lib\site-packages\cryptography\x509\oid.py
-9e0eba340f13237ef05abe2d2fa77542bca14db0533afa717e1236663d212dd7  lib\site-packages\cryptography\x509\verification.py
+be9836ac8835d4cef3d7deb47edaecb9344936d79534f84c95c4576f77a9d737  lib\site-packages\cryptography\x509\verification.py
 95f204ea108f69f9950835c864be6b27c2dfed2ef17fa7877169dcfccc2e1e66  lib\site-packages\cryptography\__about__.py
 252758497799d504a9ebb8237c8db8aae89e3cfb6b94d5e15ef9bea5abfc9ee4  lib\site-packages\enum\__init__.py
 3b023947fbae5d4e0f94e4a81bc72368c3c0d6185d1868e367c2363198523f1a  lib\site-packages\idna\core.py
@@ -263,8 +263,8 @@ ae8705ccc3685698320d3fd9adab99ce825bc6d5e02dbcca24bcbc62ba3cf9ba  lib\_MozillaCo
 a7ece64b0833a49c878408f17e6cd26db28a11efa0d5442605740ad2c9fa3c3a  lib\_strptime.py
 b82530c2be48521581d729f28632de588be52692acd8105adceee6b1a89e0942  lib\_weakrefset.py
 60f010fe02332a2941864cb2111286813c2f5f064f385f0f56912238fbfe1376  lib\__future__.py
-c68603cd9fa986689fa59d9206b8974a2299f9e50772937911f99c5a981e9b27  waptcrypto.py
-ffa1591b6f719c2e256c1fbeae87c967dcf71c0ed0c71b96c74dd29fdb14710e  waptpackage.py
+9bd8fb47c3f604c11ecc8c3050854649b8cb0e37a7abe6ec6779c5281f153f93  waptcrypto.py
+139e4213ad77436f0157b65f57debbed7779848c4adeb162e8ba89fa77847268  waptpackage.py
 c8fc52f383478e9d370157a63b5290d554839a4c2fa131bd2f61cd92e3f5b81c  waptenterprise\licencing.py
 3d992828423d12e5a18fe78bb783e4417b4b8e2e70b94c5ab7c8c49f0c98028e  waptenterprise\__init__.py
-316a4a1a3deffaaa39f68e57ffbf75d5cd4eb2d818a2c4ae4dd3512ba8bf3e40  waptutils.py
+cd1580b21108f7a3591b105b765f79f484c83a199e6b27fd487860bbe02b8a68  waptutils.py

waptconsole/waptconsole.lpi

@@ -26,9 +26,9 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
       <MinorVersionNr Value="7"/>
-      <RevisionNr Value="3"/>
-      <BuildNr Value="12"/>
-      <StringTable LegalCopyright="Tranquil IT Systems 2012-2019" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.3"/>
+      <RevisionNr Value="4"/>
+      <BuildNr Value="6009"/>
+      <StringTable LegalCopyright="Tranquil IT Systems 2012-2019" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.4"/>
     </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
@@ -299,6 +299,11 @@
         <ShowHints Value="False"/>
       </Verbosity>
       <CustomOptions Value="-dUseCThreads -dENTERPRISE"/>
+      <OtherDefines Count="3">
+        <Define0 Value="UseCThreads"/>
+        <Define1 Value="ENTERPRISE"/>
+        <Define2 Value="DEVMODE"/>
+      </OtherDefines>
     </Other>
   </CompilerOptions>
 </CONFIG>