|
426 | 426 |
|
427 | 427 | context 'basic deb822 source' do
|
428 | 428 | let :params do
|
429 |
| - super().merge({ |
430 |
| - location: ['http://debian.mirror.iweb.ca/debian/'], |
431 |
| - repos: ['main', 'contrib', 'non-free'] |
432 |
| - }) |
| 429 | + super().merge( |
| 430 | + { |
| 431 | + location: ['http://debian.mirror.iweb.ca/debian/'], |
| 432 | + repos: ['main', 'contrib', 'non-free'] |
| 433 | + }, |
| 434 | + ) |
433 | 435 | end
|
434 | 436 |
|
435 | 437 | it { is_expected.to contain_apt__setting("sources-#{title}").with_notify_update(true) }
|
436 | 438 | end
|
437 | 439 |
|
438 | 440 | context 'complex deb822 source' do
|
439 | 441 | let :params do
|
440 |
| - super().merge({ |
441 |
| - types: ['deb', 'deb-src'], |
442 |
| - location: ['http://fr.debian.org/debian', 'http://de.debian.org/debian'], |
443 |
| - release: ['stable', 'stable-updates', 'stable-backports'], |
444 |
| - repos: ['main', 'contrib', 'non-free'], |
445 |
| - architecture: ['amd64', 'i386'], |
446 |
| - allow_unsigned: true, |
447 |
| - notify_update: false |
448 |
| - }) |
| 442 | + super().merge( |
| 443 | + { |
| 444 | + types: ['deb', 'deb-src'], |
| 445 | + location: ['http://fr.debian.org/debian', 'http://de.debian.org/debian'], |
| 446 | + release: ['stable', 'stable-updates', 'stable-backports'], |
| 447 | + repos: ['main', 'contrib', 'non-free'], |
| 448 | + architecture: ['amd64', 'i386'], |
| 449 | + allow_unsigned: true, |
| 450 | + notify_update: false |
| 451 | + }, |
| 452 | + ) |
449 | 453 | end
|
450 | 454 |
|
451 | 455 | it { is_expected.to contain_apt__setting("sources-#{title}").with_notify_update(false) }
|
|
460 | 464 |
|
461 | 465 | context '.list backwards compatibility' do
|
462 | 466 | let :params do
|
463 |
| - super().merge({ |
464 |
| - location: 'http://debian.mirror.iweb.ca/debian/', |
465 |
| - release: 'unstable', |
466 |
| - repos: 'main contrib non-free', |
467 |
| - key: { |
468 |
| - id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', |
469 |
| - server: 'keyserver.ubuntu.com', |
| 467 | + super().merge( |
| 468 | + { |
| 469 | + location: 'http://debian.mirror.iweb.ca/debian/', |
| 470 | + release: 'unstable', |
| 471 | + repos: 'main contrib non-free', |
| 472 | + key: { |
| 473 | + id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', |
| 474 | + server: 'keyserver.ubuntu.com', |
| 475 | + }, |
| 476 | + pin: '-10' |
470 | 477 | },
|
471 |
| - pin: '-10' |
472 |
| - }) |
| 478 | + ) |
473 | 479 | end
|
474 | 480 |
|
475 | 481 | it { is_expected.to contain_apt__setting("sources-#{title}").with_notify_update(true) }
|
|
0 commit comments