Skip to content

Commit

Permalink
Merge pull request #548 from ubuntu/bs4
Browse files Browse the repository at this point in the history
Fix Arduino framework and tests (and remove bs4 dependency)
  • Loading branch information
didrocks authored May 22, 2018
2 parents 5d488dd + cc6d90c commit 8d9bf54
Show file tree
Hide file tree
Showing 22 changed files with 806 additions and 1,736 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ ADD tests/data/twinery.org.crt /usr/local/share/ca-certificates/
ADD tests/data/eagle-updates.circuits.io.crt /usr/local/share/ca-certificates/
ADD tests/data/godotengine.org.crt /usr/local/share/ca-certificates/
ADD tests/data/downloads.tuxfamily.org.crt /usr/local/share/ca-certificates/
ADD tests/data/www.arduino.cc.crt /usr/local/share/ca-certificates/
ADD tests/data/downloads.arduino.cc.crt /usr/local/share/ca-certificates/
ADD docker/create_packages.sh /tmp/

# Refresh the image
Expand Down
2 changes: 0 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 9),
python3,
python3-apt,
python3-argcomplete,
python3-bs4,
python3-gi,
python3-gnupg,
python3-setuptools,
Expand All @@ -34,7 +33,6 @@ Depends: ${misc:Depends},
${python3:Depends},
python3-apt,
python3-argcomplete,
python3-bs4,
python3-gi,
python3-gnupg,
python3-progressbar,
Expand Down
2 changes: 0 additions & 2 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ parts:
- gettext
- python3-apt
- python3-argcomplete
- python3-bs4
- python3-gi
- python3-gnupg
- python3-setuptools
Expand All @@ -47,7 +46,6 @@ parts:
stage-packages:
- python3-apt
- python3-argcomplete
- python3-bs4
- python3-gi
- python3-gnupg
- python3-progressbar
Expand Down
22 changes: 22 additions & 0 deletions tests/data/downloads.arduino.cc.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-----BEGIN CERTIFICATE-----
MIIDnjCCAoagAwIBAgIJAOfmK6glHE9RMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
aWRnaXRzIFB0eSBMdGQxHTAbBgNVBAMMFGRvd25sb2Fkcy5hcmR1aW5vLmNjMB4X
DTE4MDUxODA3MTk0MVoXDTI4MDMyNjA3MTk0MVowZDELMAkGA1UEBhMCQVUxEzAR
BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
IEx0ZDEdMBsGA1UEAwwUZG93bmxvYWRzLmFyZHVpbm8uY2MwggEiMA0GCSqGSIb3
DQEBAQUAA4IBDwAwggEKAoIBAQC91VEw8QadtlUwm0qDa2H8PeWD8Fvkn1Q7QNSw
3fDvuT4JG+fPX0JiN5tVTIXP3H3WHtmZL3n5gbbyAhfZOgkzDLMzNFKyJSVDMfD9
nkwkCnHs8+UOHcVhuXbyTMwlFko6qxDdvEx4Z6Emc97vTiIOKik/MFn2g6w8FZbq
NIi6wQcVwS36NyxdWvYb9pnSMNdLr2QUNGsDVZcCZV4pIlj4VxuxWvDyXUg4UCpq
iqPDSBQm9O8982FfU0+PfMzU0j1EUxQLPhiwSJL9O/IqjlS65jLQHO2rnrwuf5Eb
ZjduRipZJ2LEAp+Fv2TuUJNMnke6gwTsGOHEgP0fJLAMqT8FAgMBAAGjUzBRMB0G
A1UdDgQWBBT2Xel6tbA/wvrvHkuNf1IPhg9WtDAfBgNVHSMEGDAWgBT2Xel6tbA/
wvrvHkuNf1IPhg9WtDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IB
AQAdDECE9Nu2LG8CF/wMqrlvo3yM0g1y5YjWcFsaycaz6mpu0rztXb6oUPACDN8Z
lV6iqkI7ZSVb7eh6aExx2cpZgLdiGRaWCsIulLMC6TkHMtNjZ3ZRlaVwp5fnmO8h
BYCz1o4zn4Hidh/u4dohx/okIdaDu7Iq4o7ZNMCPgmDAYYqzX0bZk6uxMeTqE7Fp
u+BzgGAo+6YIW/yqZpuKjux0mUFzbDN++eYRcckND0ok9s5AzdbwufARy1c/N/cZ
xlXcqICxbbrBgYE9N4X8WU+93VHicOlShHoORCf+wrVAYnJU2RJGLneBpZT0lvcq
V5b59ujuEsFsGsL13DHoniQc
-----END CERTIFICATE-----
50 changes: 50 additions & 0 deletions tests/data/downloads.arduino.cc.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC91VEw8QadtlUw
m0qDa2H8PeWD8Fvkn1Q7QNSw3fDvuT4JG+fPX0JiN5tVTIXP3H3WHtmZL3n5gbby
AhfZOgkzDLMzNFKyJSVDMfD9nkwkCnHs8+UOHcVhuXbyTMwlFko6qxDdvEx4Z6Em
c97vTiIOKik/MFn2g6w8FZbqNIi6wQcVwS36NyxdWvYb9pnSMNdLr2QUNGsDVZcC
ZV4pIlj4VxuxWvDyXUg4UCpqiqPDSBQm9O8982FfU0+PfMzU0j1EUxQLPhiwSJL9
O/IqjlS65jLQHO2rnrwuf5EbZjduRipZJ2LEAp+Fv2TuUJNMnke6gwTsGOHEgP0f
JLAMqT8FAgMBAAECggEAFPrdZUZOD+IV2jBfdNTKWIFSu1k2HrdJLN9GYmG0/hl/
9KvD29RQVuCEZ1H0u/tHYQG51Mc9eMjQOkDm99gFKkIuD+updAzM6Hc9hhoXmigZ
XTG7T+sUZG+F6NN6AGNNQtyjGY50+R2i3sgRjGsbMmuQcW5bkvYMc/uC2VGDBvib
KmP6V9azbT3ukXYJKqs3XimgwCkzrvLl7aeQiP4bbSOAZxChG3OuZw6/SLUPlt9o
EyJIRcac6EnOmx5VMlWosagPyUiK9PHWi+R62/qCIYxp3zSjXFS47AZXGuuqEjxE
JbHdcVw91zPCjKCcuFXA+EHB4ej0dxsWvweyi8IuZQKBgQD89Nl4N9OH5K9YC9Ci
PqhjNQpfyb0BVRR9lrbisJwsC4JF6P7hbceOiMQ7C9GYGjWXl51HIxcOEPnUMpRR
yEFoLmRM/bP8k0LNAGF44I8OevUCI0j9PB3v3j4lh2e/ZnD4o2sSxwfoxACg9fW2
uhC75POo0nNhDUgsjBfEJ9emVwKBgQDAHgmCO8vCBXhW3YyMxpedbZeWxA2Y0ysw
qGLNl3aS4p6P7AVjz8Ugnjj4MKgj8cajob6HsSY97Rd2T7EDmLYwwhGlmtXGGmED
9MIzbqLqWiYD6DlSjYsA80pSi4T9fq8vcwE6s+748PrA/M14sNyZ3ZfETrRMgoD1
Qf1rk8iUAwKBgQCbVumtr+rRCxi64xaObBgQRGRIiqTtCoh4z3MkJvzg93ha4kiT
u0zPNSH8eLePxpierVbCdsQTuU0SiLUYu/eeuM6TkUFUnEJrjg5Noul3JP8M/wo1
qRNhWIOlnE+T9J7vsbtxXpR21tbkAeeQ/RaFrIYNaJ++O9/Uq3t01FrUJQKBgFic
gh5DnlO7WioWvgEgiEXgio7LlsnqfH1Q7WGOfu55AFG5tzK2XmIRGI3BQ4xwtAI9
VDgaCV1+wdecIjVado4+tQ0BQaDCAgVlGz3Fxfb55ZbfwbDGAFtL2/f+yjRx/jOQ
g/yjiZHg9IeXEt6cFOQTRTESbC7t8rUs3sqDu3wpAoGBAPScPkNJGV1zc4GDofTT
OLJKaXQIBLGRoYgf8tj0w+xrd/rkJzVerhau7zF5mb9MJMXylrbYa42mZ+cdmm8+
ijCCfGIHxaS0r+SUij4yIWDCkdrD/HXc2fGwDfdUR0cgrZJEqeeOLeUmxqEg8Orm
SK57umlt7FsSPlOTZX3YWwOS
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
MIIDnjCCAoagAwIBAgIJAOfmK6glHE9RMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
aWRnaXRzIFB0eSBMdGQxHTAbBgNVBAMMFGRvd25sb2Fkcy5hcmR1aW5vLmNjMB4X
DTE4MDUxODA3MTk0MVoXDTI4MDMyNjA3MTk0MVowZDELMAkGA1UEBhMCQVUxEzAR
BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
IEx0ZDEdMBsGA1UEAwwUZG93bmxvYWRzLmFyZHVpbm8uY2MwggEiMA0GCSqGSIb3
DQEBAQUAA4IBDwAwggEKAoIBAQC91VEw8QadtlUwm0qDa2H8PeWD8Fvkn1Q7QNSw
3fDvuT4JG+fPX0JiN5tVTIXP3H3WHtmZL3n5gbbyAhfZOgkzDLMzNFKyJSVDMfD9
nkwkCnHs8+UOHcVhuXbyTMwlFko6qxDdvEx4Z6Emc97vTiIOKik/MFn2g6w8FZbq
NIi6wQcVwS36NyxdWvYb9pnSMNdLr2QUNGsDVZcCZV4pIlj4VxuxWvDyXUg4UCpq
iqPDSBQm9O8982FfU0+PfMzU0j1EUxQLPhiwSJL9O/IqjlS65jLQHO2rnrwuf5Eb
ZjduRipZJ2LEAp+Fv2TuUJNMnke6gwTsGOHEgP0fJLAMqT8FAgMBAAGjUzBRMB0G
A1UdDgQWBBT2Xel6tbA/wvrvHkuNf1IPhg9WtDAfBgNVHSMEGDAWgBT2Xel6tbA/
wvrvHkuNf1IPhg9WtDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IB
AQAdDECE9Nu2LG8CF/wMqrlvo3yM0g1y5YjWcFsaycaz6mpu0rztXb6oUPACDN8Z
lV6iqkI7ZSVb7eh6aExx2cpZgLdiGRaWCsIulLMC6TkHMtNjZ3ZRlaVwp5fnmO8h
BYCz1o4zn4Hidh/u4dohx/okIdaDu7Iq4o7ZNMCPgmDAYYqzX0bZk6uxMeTqE7Fp
u+BzgGAo+6YIW/yqZpuKjux0mUFzbDN++eYRcckND0ok9s5AzdbwufARy1c/N/cZ
xlXcqICxbbrBgYE9N4X8WU+93VHicOlShHoORCf+wrVAYnJU2RJGLneBpZT0lvcq
V5b59ujuEsFsGsL13DHoniQc
-----END CERTIFICATE-----
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
105de251fc74044251dd62bcba2854ab57eb10815a4d9260809fbe2d7292a3e7435a4dd6aeef7ab8baa47ac08238c9904c1322ff1a18e6902890042b55dce9bf arduino-mock-linux32.tar.xz
105de251fc74044251dd62bcba2854ab57eb10815a4d9260809fbe2d7292a3e7435a4dd6aeef7ab8baa47ac08238c9904c1322ff1a18e6902890042b55dce9bf arduino-mock-linux64.tar.xz
7e54ba6d788c43fc2b7990a1f30350542e44a9de7e581a52a309723965a3fa097aa8f692451cc6b460e51ed86ac984d9c725199b896a86f6e1f3495111c37fde arduino-1.8.5-macosx.zip
f78622e92fa79e9d27a8e7be8cd0b998b53870260f2c747bda3ed398103bab7473a89ae16e19fbe4e8a4f7035c71c28c5eeaedf86c19173a9d4a4c080ae5d8e4 arduino-1.8.5-windows.exe
522531cb555572e30e34c89c426d0a468a82066c4e2e440124f9a824dee9a7c585787f767e7581bfa1d048c55eaa11861ebabb9051ffcc1fd9929bf7eca0f398 arduino-1.8.5-windows.zip

5 changes: 0 additions & 5 deletions tests/data/server-content/www.arduino.cc/checksums.md5sum.txt
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
65a7305053e2f20aeaf772120ba9657c arduino-1.6.5-linux32.tar.xz
65a7305053e2f20aeaf772120ba9657c arduino-1.6.5-linux64.tar.xz
035be823fa0f39a0d9b74863987137b9 arduino-1.6.5-macosx.zip
c0bfb988e7998a54d60505d2fe8eb3e5 arduino-1.6.5-r2-windows.exe
134e0672f4920c01777d4d89b1733c59 arduino-1.6.5-r2-windows.zip
Empty file.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 8d9bf54

Please sign in to comment.